diff --git a/tests/e2e/specs/RedirectTask.spec.js b/tests/e2e/specs/RedirectTask.spec.js
new file mode 100644
index 000000000..9c821239c
--- /dev/null
+++ b/tests/e2e/specs/RedirectTask.spec.js
@@ -0,0 +1,224 @@
+import moment from "moment";
+import Screens from "../fixtures/webentry.json";
+import SingleScreen from "../fixtures/single_line_input.json";
+import InterstitialScreen from "../fixtures/interstitial_screen.json";
+
+function initializeTaskAndScreenIntercepts(method, url, response) {
+  cy.intercept(
+    method,
+    url.replace(",screen,", ",").replace(",nested,", ","),
+    response
+  );
+  cy.intercept(
+    method,
+    url.replace(/\?.*$/, "/screen?include=screen,nested"),
+    response.screen
+  );
+}
+describe("Redirect Task ", () => {
+  it("On Task Completed (Submitting Task) - taskList", () => {
+    initializeTaskAndScreenIntercepts(
+      "GET",
+      "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
+      {
+        id: 1,
+        advanceStatus: "open",
+        component: "task-screen",
+        allow_interstitial: false,
+        elementDestination: {
+          type: 'taskList',
+          value: 'http://localhost:5173/tasks',
+        },
+        user: {
+          id: 1
+        },
+        screen: SingleScreen.screens[0],
+        process_request: {
+          id: 1,
+          status: "ACTIVE"
+        }
+      }
+    );
+
+    cy.visit("/?scenario=TaskRedirect", {});
+
+    cy.wait(2000);
+    cy.get(".form-group").find("button").click();
+
+    
+    cy.socketEventNext("ProcessMaker\\Events\\RedirectTo", {
+      params: [{
+        nodeId: 'node_2',
+        tokenId: 2,
+        userId: 1,
+      }],
+      method: "redirectToTask"
+    });
+    cy.wait(2000);
+    cy.url().should("eq", "http://localhost:5173/tasks");
+  });
+  it("On Task Completed (Submitting Task) - processLaunchpad", () => {
+    initializeTaskAndScreenIntercepts(
+      "GET",
+      "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
+      {
+        id: 1,
+        advanceStatus: "open",
+        component: "task-screen",
+        allow_interstitial: false,
+        elementDestination: {
+          type: 'processLaunchpad',
+          value: "http://localhost:5173/process-browser/7?categorySelected=-1",
+        },
+        user: {
+          id: 1
+        },
+        screen: SingleScreen.screens[0],
+        process_request: {
+          id: 1,
+          status: "ACTIVE"
+        }
+      }
+    );
+
+    cy.visit("/?scenario=TaskRedirect", {});
+
+    cy.wait(2000);
+    cy.get(".form-group").find("button").click();
+    
+    cy.socketEventNext("ProcessMaker\\Events\\RedirectTo", {
+      params: [{
+        nodeId: 'node_2',
+        tokenId: 2,
+        userId: 1,
+      }],
+      method: "redirectToTask"
+    });
+    cy.wait(2000);
+    cy.url().should("eq", "http://localhost:5173/process-browser/7?categorySelected=-1");
+  });
+  it("On Task Completed (Submitting Task) - homepageDashboard", () => {
+    initializeTaskAndScreenIntercepts(
+      "GET",
+      "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
+      {
+        id: 1,
+        advanceStatus: "open",
+        component: "task-screen",
+        allow_interstitial: false,
+        elementDestination: {
+          type: 'homepageDashboard',
+          value: "http://localhost:5173",
+        },
+        user: {
+          id: 1
+        },
+        screen: SingleScreen.screens[0],
+        process_request: {
+          id: 1,
+          status: "ACTIVE"
+        }
+      }
+    );
+
+    cy.visit("/?scenario=TaskRedirect", {});
+
+    cy.wait(2000);
+    cy.get(".form-group").find("button").click();
+    
+    cy.socketEventNext("ProcessMaker\\Events\\RedirectTo", {
+      params: [{
+        nodeId: 'node_2',
+        tokenId: 2,
+        userId: 1,
+      }],
+      method: "redirectToTask"
+    });
+    cy.wait(2000);
+    cy.url().should("eq", "http://localhost:5173/");
+  });
+  it("On Task Completed (Submitting Task) - customDashboard", () => {
+    initializeTaskAndScreenIntercepts(
+      "GET",
+      "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
+      {
+        id: 1,
+        advanceStatus: "open",
+        component: "task-screen",
+        allow_interstitial: false,
+        elementDestination: {
+          type: 'customDashboard',
+          value: "http://localhost:5173/home/customize-ui/dashboards/eHEXsFrIwmClHoTRnMvOdMKSPbR3HalSFxaIHYxNh67UrtloUiuDBh5N8NrMoQVP",
+        },
+        user: {
+          id: 1
+        },
+        screen: SingleScreen.screens[0],
+        process_request: {
+          id: 1,
+          status: "ACTIVE"
+        }
+      }
+    );
+
+    cy.visit("/?scenario=TaskRedirect", {});
+
+    cy.wait(2000);
+    cy.get(".form-group").find("button").click();
+    
+    cy.socketEventNext("ProcessMaker\\Events\\RedirectTo", {
+      params: [{
+        nodeId: 'node_2',
+        tokenId: 2,
+        userId: 1,
+      }],
+      method: "redirectToTask"
+    });
+    cy.wait(2000);
+    cy.url().should("eq", "http://localhost:5173/home/customize-ui/dashboards/eHEXsFrIwmClHoTRnMvOdMKSPbR3HalSFxaIHYxNh67UrtloUiuDBh5N8NrMoQVP");
+  });
+
+});
+
+function getTask(url, responseData) {
+  initializeTaskAndScreenIntercepts("GET", url, {
+    id: responseData.id,
+    advanceStatus: "completed",
+    component: "task-screen",
+    status: responseData.status,
+    allow_interstitial: responseData.allow_interstitial,
+    interstitial_screen: responseData.interstitial_screen,
+    screen: responseData.screen,
+    process_request: {
+      id: 1,
+      parent_request_id: responseData.parent_request_id,
+      status: responseData.status
+    },
+    user_request_permission: responseData.user_request_permission
+  });
+}
+function getTasks(url, responseData = null) {
+  if (responseData) {
+    cy.intercept("GET", url, {
+      data: [
+        {
+          id: responseData.taskId,
+          advanceStatus: "open",
+          process_id: 1,
+          process_request_id: responseData.process_request_id,
+          subprocess_request_id: 1,
+          status: responseData.status,
+          completed_at: null,
+          due_at: moment().add(1, "day").toISOString(),
+          due_notified: 0,
+          process_request: {
+            id: 1,
+            status: responseData.status
+          }
+        }
+      ]
+    });
+  } else {
+    cy.intercept("GET", url, { data: [] });
+  }
+}
diff --git a/tests/e2e/specs/Task.spec.js b/tests/e2e/specs/Task.spec.js
index d38e3b7f6..7ed71b9fd 100644
--- a/tests/e2e/specs/Task.spec.js
+++ b/tests/e2e/specs/Task.spec.js
@@ -16,778 +16,24 @@ function initializeTaskAndScreenIntercepts(method, url, response) {
   );
 }
 describe("Task component", () => {
-  // it("In a webentry", () => {
-  //   cy.visit("/?scenario=WebEntry", {
-  //     onBeforeLoad(win) {
-  //       // Call some code to initialize the fake server part using MockSocket
-  //       cy.stub(win, "WebSocket").callsFake((url) => ({
-  //         url,
-  //         onclose: null,
-  //         onopen: null,
-  //         close() {},
-  //         send() {}
-  //       }));
-  //       win.Echo = {};
-  //     }
-  //   });
-  //   cy.wait(2000);
-  // });
-
-  // it("Task inside a Request", () => {
-  //   initializeTaskAndScreenIntercepts(
-  //     "GET",
-  //     "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
-  //     {
-  //       id: 1,
-  //       advanceStatus: "open",
-  //       component: "task-screen",
-  //       created_at: moment().toISOString(),
-  //       completed_at: moment().toISOString(),
-  //       due_at: moment().add(1, "day").toISOString(),
-  //       user: {
-  //         avatar: "",
-  //         fullname: "Assigned User"
-  //       },
-  //       screen: Screens.screens[0],
-  //       process_request: {
-  //         id: 1,
-  //         status: "ACTIVE",
-  //         user: {
-  //           avatar: "",
-  //           fullname: "Requester User"
-  //         }
-  //       },
-  //       process: {
-  //         id: 1,
-  //         name: "Process Name"
-  //       },
-  //       user_request_permission: [{ process_request_id: 1, allowed: true }]
-  //     }
-  //   );
-
-  //   cy.visit("/?scenario=TaskAssigned", {
-  //     onBeforeLoad(win) {
-  //       // setup request-id=1
-  //       const requestIdMeta = win.document.createElement("meta");
-  //       requestIdMeta.setAttribute("name", "request-id");
-  //       requestIdMeta.setAttribute("content", "1");
-  //       win.document.head.appendChild(requestIdMeta);
-  //       // Call some code to initialize the fake server part using MockSocket
-  //       cy.stub(win, "WebSocket").callsFake((url) => ({
-  //         url,
-  //         onclose: null,
-  //         onopen: null,
-  //         close() {},
-  //         send() {}
-  //       }));
-  //     }
-  //   });
-
-  //   cy.wait(2000);
-  //   cy.get("[data-cy=screen-field-firstname]").should("be.visible");
-  //   cy.get("[data-cy=screen-field-lastname]").should("be.visible");
-  // });
-
-  // it("Completes the Task", () => {
-  //   initializeTaskAndScreenIntercepts(
-  //     "GET",
-  //     "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
-  //     {
-  //       id: 1,
-  //       advanceStatus: "open",
-  //       component: "task-screen",
-  //       created_at: moment().toISOString(),
-  //       completed_at: moment().toISOString(),
-  //       due_at: moment().add(1, "day").toISOString(),
-  //       user: {
-  //         avatar: "",
-  //         fullname: "Assigned User"
-  //       },
-  //       screen: Screens.screens[0],
-  //       process_request: {
-  //         id: 1,
-  //         status: "ACTIVE",
-  //         user: {
-  //           avatar: "",
-  //           fullname: "Requester User"
-  //         }
-  //       },
-  //       process: {
-  //         id: 1,
-  //         name: "Process Name"
-  //       },
-  //       request_data: {
-  //         firstname: "John",
-  //         lastname: "Doe"
-  //       },
-  //       user_request_permission: [{ process_request_id: 1, allowed: true }]
-  //     }
-  //   );
-
-  //   cy.visit("/?scenario=TaskAssigned", {
-  //     onBeforeLoad(win) {
-  //       // setup request-id=1
-  //       const requestIdMeta = win.document.createElement("meta");
-  //       requestIdMeta.setAttribute("name", "request-id");
-  //       requestIdMeta.setAttribute("content", "1");
-  //       win.document.head.appendChild(requestIdMeta);
-  //       // Call some code to initialize the fake server part using MockSocket
-  //       cy.stub(win, "WebSocket").callsFake((url) => ({
-  //         url,
-  //         onclose: null,
-  //         onopen: null,
-  //         close() {},
-  //         send() {}
-  //       }));
-  //       cy.stub(win, "alert").as("windowAlert");
-  //     }
-  //   });
-
-  //   cy.wait(2000);
-  //   cy.get(".form-group").find("button").click();
-  //   cy.intercept("PUT", "http://localhost:5173/api/1.1/tasks/1").then(
-  //     function () {
-  //       cy.get("@windowAlert")
-  //         .should("have.been.calledOnce")
-  //         .and("have.been.calledWith", "Task Completed Successfully")
-  //         .then(function () {
-  //           initializeTaskAndScreenIntercepts(
-  //             "GET",
-  //             "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
-  //             {
-  //               id: 1,
-  //               advanceStatus: "completed",
-  //               status: "CLOSED"
-  //             }
-  //           );
-  //           cy.reload();
-  //         });
-  //     }
-  //   );
-  //   cy.get("#tab-form > .card").should("contain.text", "Task Completed");
-  // });
-
-  // it("Progresses to the interstitial screen", () => {
-  //   initializeTaskAndScreenIntercepts(
-  //     "GET",
-  //     "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
-  //     {
-  //       id: 1,
-  //       advanceStatus: "open",
-  //       component: "task-screen",
-  //       created_at: moment().toISOString(),
-  //       completed_at: moment().toISOString(),
-  //       due_at: moment().add(1, "day").toISOString(),
-  //       status: "ACTIVE",
-  //       user: {
-  //         avatar: "",
-  //         fullname: "Assigned User"
-  //       },
-  //       screen: Screens.screens[0],
-  //       process_request: {
-  //         id: 1,
-  //         status: "ACTIVE",
-  //         user: {
-  //           avatar: "",
-  //           fullname: "Requester User"
-  //         }
-  //       },
-  //       process: {
-  //         id: 1,
-  //         name: "Process Name"
-  //       },
-  //       request_data: {
-  //         firstname: "John",
-  //         lastname: "Doe"
-  //       }
-  //     }
-  //   );
-  //   cy.visit("/?scenario=TaskAssigned", {
-  //     onBeforeLoad(win) {
-  //       // setup request-id=1
-  //       const requestIdMeta = win.document.createElement("meta");
-  //       requestIdMeta.setAttribute("name", "request-id");
-  //       requestIdMeta.setAttribute("content", "1");
-  //       win.document.head.appendChild(requestIdMeta);
-  //       // Call some code to initialize the fake server part using MockSocket
-  //       cy.stub(win, "WebSocket").callsFake((url) => ({
-  //         url,
-  //         onclose: null,
-  //         onopen: null,
-  //         close() {},
-  //         send() {}
-  //       }));
-  //       cy.stub(win, "alert").as("windowAlert");
-  //     }
-  //   });
-  //   cy.wait(2000);
-  //   cy.get(".form-group").find("button").click();
-  //   cy.intercept("PUT", "http://localhost:5173/api/1.1/tasks/1").then(
-  //     function () {
-  //       cy.get("@windowAlert")
-  //         .should("have.been.calledOnce")
-  //         .and("have.been.calledWith", "Task Completed Successfully")
-  //         .then(function () {
-  //           const completedBodyRequest = {
-  //             id: 1,
-  //             advanceStatus: "completed",
-  //             component: "task-screen",
-  //             created_at: moment().toISOString(),
-  //             completed_at: moment().toISOString(),
-  //             due_at: moment().add(1, "day").toISOString(),
-  //             status: "CLOSED",
-  //             allow_interstitial: true,
-  //             interstitial_screen: InterstitialScreen.screens[0],
-  //             user: {
-  //               avatar: "",
-  //               fullname: "Assigned User"
-  //             },
-  //             data: [
-  //               {
-  //                 id: 1,
-  //                 user_id: 1,
-  //                 process_id: 1,
-  //                 process_request_id: 1,
-  //                 subprocess_request_id: null,
-  //                 element_id: "node_4",
-  //                 element_type: "task",
-  //                 element_name: "Form Task",
-  //                 status: "ACTIVE",
-  //                 element_index: 0,
-  //                 subprocess_start_event_id: null,
-  //                 completed_at: null,
-  //                 due_at: "2023-02-18T17:54:15+00:00",
-  //                 due_notified: 0,
-  //                 initiated_at: null,
-  //                 riskchanges_at: "2023-02-17T19:54:15+00:00",
-  //                 created_at: "2023-02-15T17:54:15+00:00",
-  //                 updated_at: "2023-02-15T17:54:15+00:00",
-  //                 version_id: 3,
-  //                 version_type: "ProcessMaker\\Models\\ScreenVersion",
-  //                 advanceStatus: "open",
-  //                 process_request: {
-  //                   id: 1,
-  //                   process_id: 1,
-  //                   process_collaboration_id: null,
-  //                   user_id: 1,
-  //                   parent_request_id: null,
-  //                   participant_id: null,
-  //                   callable_id: "ProcessId",
-  //                   status: "ACTIVE",
-  //                   name: "simple",
-  //                   errors: null,
-  //                   completed_at: null,
-  //                   initiated_at: "2023-02-15T17:53:45+00:00",
-  //                   created_at: "2023-02-15T17:53:45+00:00",
-  //                   updated_at: "2023-02-15T17:54:15+00:00",
-  //                   process_version_id: 7,
-  //                   signal_events: []
-  //                 },
-  //                 user: {
-  //                   id: 1,
-  //                   email: "admin@processmaker.com",
-  //                   firstname: "Admin",
-  //                   lastname: "User",
-  //                   username: "admin",
-  //                   status: "ACTIVE",
-  //                   meta: null,
-  //                   is_administrator: true,
-  //                   active_at: "2023-02-15T17:54:05+00:00",
-  //                   created_at: "2023-02-10T14:03:26+00:00",
-  //                   updated_at: "2023-02-10T14:03:26+00:00",
-  //                   manager_id: null,
-  //                   fullname: "Admin User",
-  //                   avatar: ""
-  //                 }
-  //               }
-  //             ],
-  //             screen: Screens.screens[0],
-  //             process_request: {
-  //               id: 1,
-  //               status: "CLOSED",
-  //               user: {
-  //                 avatar: "",
-  //                 fullname: "Requester User"
-  //               }
-  //             },
-  //             process: {
-  //               id: 1,
-  //               name: "Process Name"
-  //             },
-  //             request_data: {
-  //               firstname: "John",
-  //               lastname: "Doe"
-  //             }
-  //           };
-  //           cy.intercept("GET", "/api/1.1/tasks**", {
-  //             body: completedBodyRequest
-  //           });
-  //           initializeTaskAndScreenIntercepts(
-  //             "GET",
-  //             "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
-  //             { body: completedBodyRequest }
-  //           );
-  //           cy.reload();
-  //         });
-  //       cy.wait(2000);
-  //       cy.get(".form-group > :nth-child(1) > div").should(
-  //         "contain.text",
-  //         "Please wait"
-  //       );
-  //     }
-  //   );
-  // });
-  // it("It updates the PM4ConfigOverrides", () => {
-  //   initializeTaskAndScreenIntercepts(
-  //     "GET",
-  //     "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
-  //     {
-  //       id: 1,
-  //       advanceStatus: "open",
-  //       component: "task-screen",
-  //       created_at: moment().toISOString(),
-  //       completed_at: moment().toISOString(),
-  //       due_at: moment().add(1, "day").toISOString(),
-  //       status: "ACTIVE",
-  //       user: {
-  //         avatar: "",
-  //         fullname: "Assigned User"
-  //       },
-  //       screen: Screens.screens[0],
-  //       process_request: {
-  //         id: 1,
-  //         status: "ACTIVE",
-  //         user: {
-  //           avatar: "",
-  //           fullname: "Requester User"
-  //         }
-  //       },
-  //       process: {
-  //         id: 1,
-  //         name: "Process Name"
-  //       },
-  //       request_data: {
-  //         firstname: "John",
-  //         lastname: "Doe"
-  //       }
-  //     }
-  //   );
-  //   cy.visit("/?scenario=TaskAssigned", {
-  //     onBeforeLoad(win) {
-  //       // setup request-id=1
-  //       const requestIdMeta = win.document.createElement("meta");
-  //       requestIdMeta.setAttribute("name", "request-id");
-  //       requestIdMeta.setAttribute("content", "1");
-  //       win.document.head.appendChild(requestIdMeta);
-  //       win.PM4ConfigOverrides = {
-  //         getScreenEndpoint: "tasks/123/screens"
-  //       };
-  //       // Call some code to initialize the fake server part using MockSocket
-  //       cy.stub(win, "WebSocket").callsFake((url) => ({
-  //         url,
-  //         onclose: null,
-  //         onopen: null,
-  //         close() {},
-  //         send() {}
-  //       }));
-  //       cy.stub(win, "alert").as("windowAlert");
-  //     }
-  //   });
-  //   cy.window()
-  //     .its("PM4ConfigOverrides.getScreenEndpoint")
-  //     .should("equal", "tasks/1/screens");
-  // });
-  // /* DNAT = Display Next Assigned Task
-  //  parentTask1                                           parentTask2
-  //             \_______childTask1_______childTask2_______/
-  //                       (DNAT)
-  //  After childTask1 should redirect to childTask2
-  // */
-  // it("Task with display next assigned task checked with another pending task in same request should redirect to the next task of same request", () => {
-  //   initializeTaskAndScreenIntercepts(
-  //     "GET",
-  //     "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
-  //     {
-  //       id: 1,
-  //       advanceStatus: "open",
-  //       component: "task-screen",
-  //       screen: SingleScreen.screens[0],
-  //       process_request: {
-  //         id: 1,
-  //         status: "ACTIVE"
-  //       }
-  //     }
-  //   );
-
-  //   cy.visit("/?scenario=TaskRedirect", {});
-
-  //   cy.wait(2000);
-  //   cy.get(".form-group").find("button").click();
-
-  //   cy.intercept("PUT", "http://localhost:5173/api/1.1/tasks/1").then(
-  //     function () {
-  //       const responseDataTask1 = {
-  //         status: "CLOSED",
-  //         process_request_id: 2,
-  //         id: 1,
-  //         screen: SingleScreen.screens[0],
-  //         allow_interstitial: true,
-  //         interstitial_screen: InterstitialScreen.screens[0]
-  //       };
-
-  //       getTask(
-  //         `http://localhost:5173/api/1.1/tasks/${responseDataTask1.id}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`,
-  //         responseDataTask1
-  //       );
-
-  //       const responseDataTasks = {
-  //         status: "ACTIVE",
-  //         taskId: 2,
-  //         process_request_id: 2
-  //       };
-
-  //       getTasks(
-  //         "http://localhost:5173/api/1.1/tasks?user_id=1&status=ACTIVE&process_request_id=1&include_sub_tasks=1",
-  //         responseDataTasks
-  //       );
-
-  //       const responseDataTask2 = {
-  //         status: "ACTIVE",
-  //         process_request_id: 2,
-  //         parent_request_id: 1,
-  //         taskId: 2,
-  //         screen: Screens.screens[0],
-  //         allow_interstitial: false,
-  //         interstitial_screen: null
-  //       };
-
-  //       getTask(
-  //         `http://localhost:5173/api/1.1/tasks/${responseDataTask2.taskId}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`,
-  //         responseDataTask2
-  //       );
-
-  //       cy.wait(2000);
-  //       cy.reload();
-  //     }
-  //   );
-
-  //   cy.url().should("eq", "http://localhost:5173/tasks/2/edit");
-  // });
-
-  // /* DNAT = Display Next Assigned Task
-  //  parentTask1                                                     parentTask2
-  //             \_______childTask1___scriptTask____childTask2_______/
-  //                       (DNAT)
-  // */
-  // it("Task with display next assigned task checked in subprocess and no pending task and status closed or open should redirect to parent requests", () => {
-  //   initializeTaskAndScreenIntercepts(
-  //     "GET",
-  //     "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
-  //     {
-  //       id: 1,
-  //       advanceStatus: "open",
-  //       component: "task-screen",
-  //       screen: SingleScreen.screens[0],
-  //       process_request: {
-  //         id: 1,
-  //         status: "ACTIVE"
-  //       }
-  //     }
-  //   );
-
-  //   cy.visit("/?scenario=TaskRedirect", {});
-
-  //   cy.wait(2000);
-  //   cy.get(".form-group").find("button").click();
-
-  //   cy.intercept("PUT", "http://localhost:5173/api/1.1/tasks/1").then(
-  //     function () {
-  //       const responseDataTask1 = {
-  //         status: "CLOSED",
-  //         process_request_id: 2,
-  //         id: 1,
-  //         screen: SingleScreen.screens[0],
-  //         allow_interstitial: true,
-  //         interstitial_screen: InterstitialScreen.screens[0],
-  //         parent_request_id: 1
-  //       };
-
-  //       getTask(
-  //         `http://localhost:5173/api/1.1/tasks/${responseDataTask1.id}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`,
-  //         responseDataTask1
-  //       );
-
-  //       getTasks(
-  //         "http://localhost:5173/api/1.1/tasks?user_id=1&status=ACTIVE&process_request_id=1&include_sub_tasks=1",
-  //         null
-  //       );
-
-  //       const responseDataTask2 = {
-  //         status: "ACTIVE",
-  //         process_request_id: 2,
-  //         taskId: 2,
-  //         screen: Screens.screens[0],
-  //         allow_interstitial: false,
-  //         interstitial_screen: null
-  //       };
-
-  //       getTask(
-  //         `http://localhost:5173/api/1.1/tasks/${responseDataTask2.taskId}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`,
-  //         responseDataTask2
-  //       );
-
-  //       cy.wait(2000);
-  //       cy.reload();
-  //     }
-  //   );
-
-  //   cy.url().should("eq", "http://localhost:5173/requests/1");
-  // });
-
-  // /* DNAT = Display Next Assigned Task
-  //  parentTask1                           parentTask2
-  //             \_______childTask1_______/
-  //                       (DNAT)
-  //  After childTask1 should redirect to parentTask2
-  // */
-  // it("Task with display next assigned task checked in different process request should redirect to the next task of parent request", () => {
-  //   initializeTaskAndScreenIntercepts(
-  //     "GET",
-  //     "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
-  //     {
-  //       id: 1,
-  //       advanceStatus: "open",
-  //       component: "task-screen",
-  //       screen: SingleScreen.screens[0],
-  //       process_request: {
-  //         id: 1,
-  //         status: "ACTIVE"
-  //       }
-  //     }
-  //   );
-
-  //   cy.visit("/?scenario=TaskRedirect", {});
-
-  //   cy.wait(2000);
-  //   cy.get(".form-group").find("button").click();
-
-  //   cy.intercept("PUT", "http://localhost:5173/api/1.1/tasks/1").then(
-  //     function () {
-  //       const responseDataTask1 = {
-  //         status: "CLOSED",
-  //         process_request_id: 1,
-  //         id: 1,
-  //         screen: SingleScreen.screens[0],
-  //         allow_interstitial: true,
-  //         interstitial_screen: InterstitialScreen.screens[0]
-  //       };
-
-  //       getTask(
-  //         `http://localhost:5173/api/1.1/tasks/${responseDataTask1.id}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`,
-  //         responseDataTask1
-  //       );
-
-  //       const responseDataTasks = {
-  //         status: "ACTIVE",
-  //         taskId: 2,
-  //         process_request_id: 2
-  //       };
-
-  //       getTasks(
-  //         "http://localhost:5173/api/1.1/tasks?user_id=1&status=ACTIVE&process_request_id=1&include_sub_tasks=1",
-  //         responseDataTasks
-  //       );
-
-  //       const responseDataTask2 = {
-  //         status: "ACTIVE",
-  //         process_request_id: 1,
-  //         taskId: 2,
-  //         screen: Screens.screens[0],
-  //         allow_interstitial: false,
-  //         interstitial_screen: null
-  //       };
-
-  //       getTask(
-  //         `http://localhost:5173/api/1.1/tasks/${responseDataTask2.taskId}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`,
-  //         responseDataTask2
-  //       );
-
-  //       cy.wait(2000);
-  //       cy.reload();
-  //     }
-  //   );
-
-  //   cy.url().should("eq", "http://localhost:5173/tasks/2/edit");
-  // });
-
-  // /* DNAT = Display Next Assigned Task
-  //  parentTask1                           parentTask2
-  //             \_______childTask1_______/
-  //  After childTask1 (Not DNAT) should redirect to tasks list
-  // */
-  // it("Task with display next assigned task unchecked should redirect to tasks list", () => {
-  //   initializeTaskAndScreenIntercepts(
-  //     "GET",
-  //     "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
-  //     {
-  //       id: 1,
-  //       advanceStatus: "open",
-  //       component: "task-screen",
-  //       screen: SingleScreen.screens[0],
-  //       process_request: {
-  //         id: 1,
-  //         status: "ACTIVE"
-  //       }
-  //     }
-  //   );
-
-  //   cy.visit("/?scenario=TaskRedirect", {});
-
-  //   cy.wait(2000);
-  //   cy.get(".form-group").find("button").click();
-
-  //   cy.intercept("PUT", "http://localhost:5173/api/1.1/tasks/1").then(
-  //     function () {
-  //       const responseDataTask1 = {
-  //         status: "CLOSED",
-  //         process_request_id: 1,
-  //         id: 1,
-  //         screen: SingleScreen.screens[0],
-  //         allow_interstitial: false,
-  //         interstitial_screen: null
-  //       };
-
-  //       getTask(
-  //         `http://localhost:5173/api/1.1/tasks/${responseDataTask1.id}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`,
-  //         responseDataTask1
-  //       );
-
-  //       cy.wait(2000);
-  //       cy.reload();
-  //     }
-  //   );
-
-  //   cy.url().should("eq", "http://localhost:5173/tasks");
-  // });
-
-  // /* DNAT = Display Next Assigned Task
-  //  parentTask1_____________________endEvent
-  //    (DNAT)
-  //  After parentTask1 and not pending tasks should redirect to same request
-  // */
-  // it("Process without pending task should redirect to request", () => {
-  //   initializeTaskAndScreenIntercepts(
-  //     "GET",
-  //     "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
-  //     {
-  //       id: 1,
-  //       advanceStatus: "open",
-  //       component: "task-screen",
-  //       screen: SingleScreen.screens[0],
-  //       process_request: {
-  //         id: 1,
-  //         status: "ACTIVE"
-  //       }
-  //     }
-  //   );
-
-  //   cy.visit("/?scenario=TaskRedirect", {});
-
-  //   cy.wait(2000);
-  //   cy.get(".form-group").find("button").click();
-
-  //   cy.intercept("PUT", "http://localhost:5173/api/1.1/tasks/1").then(
-  //     function () {
-  //       const responseDataTask1 = {
-  //         status: "CLOSED",
-  //         process_request_id: 1,
-  //         id: 1,
-  //         screen: SingleScreen.screens[0],
-  //         allow_interstitial: true,
-  //         interstitial_screen: InterstitialScreen.screens[0]
-  //       };
-
-  //       getTask(
-  //         `http://localhost:5173/api/1.1/tasks/${responseDataTask1.id}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`,
-  //         responseDataTask1
-  //       );
-
-  //       getTasks(
-  //         "http://localhost:5173/api/1.1/tasks?user_id=1&status=ACTIVE&process_request_id=1&include_sub_tasks=1"
-  //       );
-  //     }
-  //   );
-
-  //   cy.socketEvent("ProcessMaker\\Events\\RedirectTo", {
-  //     requestId: 1,
-  //     event: "ACTIVITY_COMPLETED"
-  //   });
-
-  //   cy.url().should("eq", "http://localhost:5173/requests/1");
-  // });
-
-  // /* DNAT = Display Next Assigned Task
-  //  parentTask1                           endEvent
-  //             \_______childTask1_______/
-  //                      (DNAT)
-  //  After childTask1 and not pending tasks should redirect to parent Request
-  // */
-  // it("Subprocess without pending task should redirect to parent request", () => {
-  //   initializeTaskAndScreenIntercepts(
-  //     "GET",
-  //     "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
-  //     {
-  //       id: 1,
-  //       advanceStatus: "open",
-  //       component: "task-screen",
-  //       screen: SingleScreen.screens[0],
-  //       process_request: {
-  //         id: 2,
-  //         status: "ACTIVE",
-  //         parent_request_id: 1
-  //       },
-  //       user_request_permission: [{ process_request_id: 2, allowed: true }]
-  //     }
-  //   );
-
-  //   cy.visit("/?scenario=TaskRedirect", {});
-
-  //   cy.wait(2000);
-  //   cy.get(".form-group").find("button").click();
-
-  //   cy.intercept("PUT", "http://localhost:5173/api/1.1/tasks/1").then(
-  //     function () {
-  //       const responseDataTask1 = {
-  //         status: "CLOSED",
-  //         process_request_id: 2,
-  //         parent_request_id: 3,
-  //         id: 1,
-  //         screen: SingleScreen.screens[0],
-  //         allow_interstitial: true,
-  //         interstitial_screen: InterstitialScreen.screens[0],
-  //         user_request_permission: [
-  //           { process_request_id: 3, allowed: true },
-  //           { process_request_id: 2, allowed: true }
-  //         ]
-  //       };
-
-  //       getTask(
-  //         `http://localhost:5173/api/1.1/tasks/${responseDataTask1.id}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`,
-  //         responseDataTask1
-  //       );
-
-  //       getTasks(
-  //         "http://localhost:5173/api/1.1/tasks?user_id=1&status=ACTIVE&process_request_id=1&include_sub_tasks=1"
-  //       );
-
-  //       cy.wait(2000);
-  //       cy.reload();
-  //     }
-  //   );
-
-  //   cy.url().should("eq", "http://localhost:5173/requests/3");
-  // });
-  it("On Task Completed (Submitting Task) - Default Behavior (taskSource)", () => {
+  it("In a webentry", () => {
+    cy.visit("/?scenario=WebEntry", {
+      onBeforeLoad(win) {
+        // Call some code to initialize the fake server part using MockSocket
+        cy.stub(win, "WebSocket").callsFake((url) => ({
+          url,
+          onclose: null,
+          onopen: null,
+          close() {},
+          send() {}
+        }));
+        win.Echo = {};
+      }
+    });
+    cy.wait(2000);
+  });
+
+  it("Task inside a Request", () => {
     initializeTaskAndScreenIntercepts(
       "GET",
       "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
@@ -795,14 +41,523 @@ describe("Task component", () => {
         id: 1,
         advanceStatus: "open",
         component: "task-screen",
-        allow_interstitial: false,
-        elementDestination: {
-          type: 'taskSource',
-          value: 'taskSource',
+        created_at: moment().toISOString(),
+        completed_at: moment().toISOString(),
+        due_at: moment().add(1, "day").toISOString(),
+        user: {
+          avatar: "",
+          fullname: "Assigned User"
         },
+        screen: Screens.screens[0],
+        process_request: {
+          id: 1,
+          status: "ACTIVE",
+          user: {
+            avatar: "",
+            fullname: "Requester User"
+          }
+        },
+        process: {
+          id: 1,
+          name: "Process Name"
+        },
+        user_request_permission: [{ process_request_id: 1, allowed: true }]
+      }
+    );
+
+    cy.visit("/?scenario=TaskAssigned", {
+      onBeforeLoad(win) {
+        // setup request-id=1
+        const requestIdMeta = win.document.createElement("meta");
+        requestIdMeta.setAttribute("name", "request-id");
+        requestIdMeta.setAttribute("content", "1");
+        win.document.head.appendChild(requestIdMeta);
+        // Call some code to initialize the fake server part using MockSocket
+        cy.stub(win, "WebSocket").callsFake((url) => ({
+          url,
+          onclose: null,
+          onopen: null,
+          close() {},
+          send() {}
+        }));
+      }
+    });
+
+    cy.wait(2000);
+    cy.get("[data-cy=screen-field-firstname]").should("be.visible");
+    cy.get("[data-cy=screen-field-lastname]").should("be.visible");
+  });
+
+  it("Completes the Task", () => {
+    initializeTaskAndScreenIntercepts(
+      "GET",
+      "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
+      {
+        id: 1,
+        advanceStatus: "open",
+        component: "task-screen",
+        created_at: moment().toISOString(),
+        completed_at: moment().toISOString(),
+        due_at: moment().add(1, "day").toISOString(),
         user: {
-          id: 1
+          avatar: "",
+          fullname: "Assigned User"
+        },
+        screen: Screens.screens[0],
+        process_request: {
+          id: 1,
+          status: "ACTIVE",
+          user: {
+            avatar: "",
+            fullname: "Requester User"
+          }
         },
+        process: {
+          id: 1,
+          name: "Process Name"
+        },
+        request_data: {
+          firstname: "John",
+          lastname: "Doe"
+        },
+        user_request_permission: [{ process_request_id: 1, allowed: true }]
+      }
+    );
+
+    cy.visit("/?scenario=TaskAssigned", {
+      onBeforeLoad(win) {
+        // setup request-id=1
+        const requestIdMeta = win.document.createElement("meta");
+        requestIdMeta.setAttribute("name", "request-id");
+        requestIdMeta.setAttribute("content", "1");
+        win.document.head.appendChild(requestIdMeta);
+        // Call some code to initialize the fake server part using MockSocket
+        cy.stub(win, "WebSocket").callsFake((url) => ({
+          url,
+          onclose: null,
+          onopen: null,
+          close() {},
+          send() {}
+        }));
+        cy.stub(win, "alert").as("windowAlert");
+      }
+    });
+
+    cy.wait(2000);
+    cy.get(".form-group").find("button").click();
+    cy.intercept("PUT", "http://localhost:5173/api/1.1/tasks/1").then(
+      function () {
+        cy.get("@windowAlert")
+          .should("have.been.calledOnce")
+          .and("have.been.calledWith", "Task Completed Successfully")
+          .then(function () {
+            initializeTaskAndScreenIntercepts(
+              "GET",
+              "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
+              {
+                id: 1,
+                advanceStatus: "completed",
+                status: "CLOSED"
+              }
+            );
+            cy.reload();
+          });
+      }
+    );
+    cy.get("#tab-form > .card").should("contain.text", "Task Completed");
+  });
+
+  it("Progresses to the interstitial screen", () => {
+    initializeTaskAndScreenIntercepts(
+      "GET",
+      "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
+      {
+        id: 1,
+        advanceStatus: "open",
+        component: "task-screen",
+        created_at: moment().toISOString(),
+        completed_at: moment().toISOString(),
+        due_at: moment().add(1, "day").toISOString(),
+        status: "ACTIVE",
+        user: {
+          avatar: "",
+          fullname: "Assigned User"
+        },
+        screen: Screens.screens[0],
+        process_request: {
+          id: 1,
+          status: "ACTIVE",
+          user: {
+            avatar: "",
+            fullname: "Requester User"
+          }
+        },
+        process: {
+          id: 1,
+          name: "Process Name"
+        },
+        request_data: {
+          firstname: "John",
+          lastname: "Doe"
+        }
+      }
+    );
+    cy.visit("/?scenario=TaskAssigned", {
+      onBeforeLoad(win) {
+        // setup request-id=1
+        const requestIdMeta = win.document.createElement("meta");
+        requestIdMeta.setAttribute("name", "request-id");
+        requestIdMeta.setAttribute("content", "1");
+        win.document.head.appendChild(requestIdMeta);
+        // Call some code to initialize the fake server part using MockSocket
+        cy.stub(win, "WebSocket").callsFake((url) => ({
+          url,
+          onclose: null,
+          onopen: null,
+          close() {},
+          send() {}
+        }));
+        cy.stub(win, "alert").as("windowAlert");
+      }
+    });
+    cy.wait(2000);
+    cy.get(".form-group").find("button").click();
+    cy.intercept("PUT", "http://localhost:5173/api/1.1/tasks/1").then(
+      function () {
+        cy.get("@windowAlert")
+          .should("have.been.calledOnce")
+          .and("have.been.calledWith", "Task Completed Successfully")
+          .then(function () {
+            const completedBodyRequest = {
+              id: 1,
+              advanceStatus: "completed",
+              component: "task-screen",
+              created_at: moment().toISOString(),
+              completed_at: moment().toISOString(),
+              due_at: moment().add(1, "day").toISOString(),
+              status: "CLOSED",
+              allow_interstitial: true,
+              interstitial_screen: InterstitialScreen.screens[0],
+              user: {
+                avatar: "",
+                fullname: "Assigned User"
+              },
+              data: [
+                {
+                  id: 1,
+                  user_id: 1,
+                  process_id: 1,
+                  process_request_id: 1,
+                  subprocess_request_id: null,
+                  element_id: "node_4",
+                  element_type: "task",
+                  element_name: "Form Task",
+                  status: "ACTIVE",
+                  element_index: 0,
+                  subprocess_start_event_id: null,
+                  completed_at: null,
+                  due_at: "2023-02-18T17:54:15+00:00",
+                  due_notified: 0,
+                  initiated_at: null,
+                  riskchanges_at: "2023-02-17T19:54:15+00:00",
+                  created_at: "2023-02-15T17:54:15+00:00",
+                  updated_at: "2023-02-15T17:54:15+00:00",
+                  version_id: 3,
+                  version_type: "ProcessMaker\\Models\\ScreenVersion",
+                  advanceStatus: "open",
+                  process_request: {
+                    id: 1,
+                    process_id: 1,
+                    process_collaboration_id: null,
+                    user_id: 1,
+                    parent_request_id: null,
+                    participant_id: null,
+                    callable_id: "ProcessId",
+                    status: "ACTIVE",
+                    name: "simple",
+                    errors: null,
+                    completed_at: null,
+                    initiated_at: "2023-02-15T17:53:45+00:00",
+                    created_at: "2023-02-15T17:53:45+00:00",
+                    updated_at: "2023-02-15T17:54:15+00:00",
+                    process_version_id: 7,
+                    signal_events: []
+                  },
+                  user: {
+                    id: 1,
+                    email: "admin@processmaker.com",
+                    firstname: "Admin",
+                    lastname: "User",
+                    username: "admin",
+                    status: "ACTIVE",
+                    meta: null,
+                    is_administrator: true,
+                    active_at: "2023-02-15T17:54:05+00:00",
+                    created_at: "2023-02-10T14:03:26+00:00",
+                    updated_at: "2023-02-10T14:03:26+00:00",
+                    manager_id: null,
+                    fullname: "Admin User",
+                    avatar: ""
+                  }
+                }
+              ],
+              screen: Screens.screens[0],
+              process_request: {
+                id: 1,
+                status: "CLOSED",
+                user: {
+                  avatar: "",
+                  fullname: "Requester User"
+                }
+              },
+              process: {
+                id: 1,
+                name: "Process Name"
+              },
+              request_data: {
+                firstname: "John",
+                lastname: "Doe"
+              }
+            };
+            cy.intercept("GET", "/api/1.1/tasks**", {
+              body: completedBodyRequest
+            });
+            initializeTaskAndScreenIntercepts(
+              "GET",
+              "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
+              { body: completedBodyRequest }
+            );
+            cy.reload();
+          });
+        cy.wait(2000);
+        cy.get(".form-group > :nth-child(1) > div").should(
+          "contain.text",
+          "Please wait"
+        );
+      }
+    );
+  });
+  it("It updates the PM4ConfigOverrides", () => {
+    initializeTaskAndScreenIntercepts(
+      "GET",
+      "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
+      {
+        id: 1,
+        advanceStatus: "open",
+        component: "task-screen",
+        created_at: moment().toISOString(),
+        completed_at: moment().toISOString(),
+        due_at: moment().add(1, "day").toISOString(),
+        status: "ACTIVE",
+        user: {
+          avatar: "",
+          fullname: "Assigned User"
+        },
+        screen: Screens.screens[0],
+        process_request: {
+          id: 1,
+          status: "ACTIVE",
+          user: {
+            avatar: "",
+            fullname: "Requester User"
+          }
+        },
+        process: {
+          id: 1,
+          name: "Process Name"
+        },
+        request_data: {
+          firstname: "John",
+          lastname: "Doe"
+        }
+      }
+    );
+    cy.visit("/?scenario=TaskAssigned", {
+      onBeforeLoad(win) {
+        // setup request-id=1
+        const requestIdMeta = win.document.createElement("meta");
+        requestIdMeta.setAttribute("name", "request-id");
+        requestIdMeta.setAttribute("content", "1");
+        win.document.head.appendChild(requestIdMeta);
+        win.PM4ConfigOverrides = {
+          getScreenEndpoint: "tasks/123/screens"
+        };
+        // Call some code to initialize the fake server part using MockSocket
+        cy.stub(win, "WebSocket").callsFake((url) => ({
+          url,
+          onclose: null,
+          onopen: null,
+          close() {},
+          send() {}
+        }));
+        cy.stub(win, "alert").as("windowAlert");
+      }
+    });
+    cy.window()
+      .its("PM4ConfigOverrides.getScreenEndpoint")
+      .should("equal", "tasks/1/screens");
+  });
+  /* DNAT = Display Next Assigned Task
+   parentTask1                                           parentTask2
+              \_______childTask1_______childTask2_______/
+                        (DNAT)
+   After childTask1 should redirect to childTask2
+  */
+  it("Task with display next assigned task checked with another pending task in same request should redirect to the next task of same request", () => {
+    initializeTaskAndScreenIntercepts(
+      "GET",
+      "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
+      {
+        id: 1,
+        advanceStatus: "open",
+        component: "task-screen",
+        screen: SingleScreen.screens[0],
+        process_request: {
+          id: 1,
+          status: "ACTIVE"
+        }
+      }
+    );
+
+    cy.visit("/?scenario=TaskRedirect", {});
+
+    cy.wait(2000);
+    cy.get(".form-group").find("button").click();
+
+    cy.intercept("PUT", "http://localhost:5173/api/1.1/tasks/1").then(
+      function () {
+        const responseDataTask1 = {
+          status: "CLOSED",
+          process_request_id: 2,
+          id: 1,
+          screen: SingleScreen.screens[0],
+          allow_interstitial: true,
+          interstitial_screen: InterstitialScreen.screens[0]
+        };
+
+        getTask(
+          `http://localhost:5173/api/1.1/tasks/${responseDataTask1.id}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`,
+          responseDataTask1
+        );
+
+        const responseDataTasks = {
+          status: "ACTIVE",
+          taskId: 2,
+          process_request_id: 2
+        };
+
+        getTasks(
+          "http://localhost:5173/api/1.1/tasks?user_id=1&status=ACTIVE&process_request_id=1&include_sub_tasks=1",
+          responseDataTasks
+        );
+
+        const responseDataTask2 = {
+          status: "ACTIVE",
+          process_request_id: 2,
+          parent_request_id: 1,
+          taskId: 2,
+          screen: Screens.screens[0],
+          allow_interstitial: false,
+          interstitial_screen: null
+        };
+
+        getTask(
+          `http://localhost:5173/api/1.1/tasks/${responseDataTask2.taskId}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`,
+          responseDataTask2
+        );
+
+        cy.wait(2000);
+        cy.reload();
+      }
+    );
+
+    cy.url().should("eq", "http://localhost:5173/tasks/2/edit");
+  });
+
+  /* DNAT = Display Next Assigned Task
+   parentTask1                                                     parentTask2
+              \_______childTask1___scriptTask____childTask2_______/
+                        (DNAT)
+  */
+  it("Task with display next assigned task checked in subprocess and no pending task and status closed or open should redirect to parent requests", () => {
+    initializeTaskAndScreenIntercepts(
+      "GET",
+      "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
+      {
+        id: 1,
+        advanceStatus: "open",
+        component: "task-screen",
+        screen: SingleScreen.screens[0],
+        process_request: {
+          id: 1,
+          status: "ACTIVE"
+        }
+      }
+    );
+
+    cy.visit("/?scenario=TaskRedirect", {});
+
+    cy.wait(2000);
+    cy.get(".form-group").find("button").click();
+
+    cy.intercept("PUT", "http://localhost:5173/api/1.1/tasks/1").then(
+      function () {
+        const responseDataTask1 = {
+          status: "CLOSED",
+          process_request_id: 2,
+          id: 1,
+          screen: SingleScreen.screens[0],
+          allow_interstitial: true,
+          interstitial_screen: InterstitialScreen.screens[0],
+          parent_request_id: 1
+        };
+
+        getTask(
+          `http://localhost:5173/api/1.1/tasks/${responseDataTask1.id}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`,
+          responseDataTask1
+        );
+
+        getTasks(
+          "http://localhost:5173/api/1.1/tasks?user_id=1&status=ACTIVE&process_request_id=1&include_sub_tasks=1",
+          null
+        );
+
+        const responseDataTask2 = {
+          status: "ACTIVE",
+          process_request_id: 2,
+          taskId: 2,
+          screen: Screens.screens[0],
+          allow_interstitial: false,
+          interstitial_screen: null
+        };
+
+        getTask(
+          `http://localhost:5173/api/1.1/tasks/${responseDataTask2.taskId}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`,
+          responseDataTask2
+        );
+
+        cy.wait(2000);
+        cy.reload();
+      }
+    );
+
+    cy.url().should("eq", "http://localhost:5173/requests/1");
+  });
+
+  /* DNAT = Display Next Assigned Task
+   parentTask1                           parentTask2
+              \_______childTask1_______/
+                        (DNAT)
+   After childTask1 should redirect to parentTask2
+  */
+  it("Task with display next assigned task checked in different process request should redirect to the next task of parent request", () => {
+    initializeTaskAndScreenIntercepts(
+      "GET",
+      "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
+      {
+        id: 1,
+        advanceStatus: "open",
+        component: "task-screen",
         screen: SingleScreen.screens[0],
         process_request: {
           id: 1,
@@ -832,26 +587,52 @@ describe("Task component", () => {
           responseDataTask1
         );
 
+        const responseDataTasks = {
+          status: "ACTIVE",
+          taskId: 2,
+          process_request_id: 2
+        };
+
         getTasks(
-          "http://localhost:5173/api/1.1/tasks?user_id=1&status=ACTIVE&process_request_id=1&include_sub_tasks=1"
+          "http://localhost:5173/api/1.1/tasks?user_id=1&status=ACTIVE&process_request_id=1&include_sub_tasks=1",
+          responseDataTasks
         );
+
+        const responseDataTask2 = {
+          status: "ACTIVE",
+          process_request_id: 1,
+          taskId: 2,
+          screen: Screens.screens[0],
+          allow_interstitial: false,
+          interstitial_screen: null
+        };
+
+        getTask(
+          `http://localhost:5173/api/1.1/tasks/${responseDataTask2.taskId}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`,
+          responseDataTask2
+        );
+
+        cy.wait(2000);
+        cy.reload();
       }
     );
+
+    cy.url().should("eq", "http://localhost:5173/tasks/2/edit");
+  });
+
+  /* DNAT = Display Next Assigned Task
+   parentTask1                           parentTask2
+              \_______childTask1_______/
+   After childTask1 (Not DNAT) should redirect to tasks list
+  */
+  it("Task with display next assigned task unchecked should redirect to tasks list", () => {
     initializeTaskAndScreenIntercepts(
-      "GET", 
-      "http://localhost:5173/api/1.1/tasks/2?include=data,user,draft,requestor,processRequest,component,requestData,loopContext,bpmnTagName,interstitial,definition,userRequestPermission,elementDestination",
+      "GET",
+      "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
       {
-        id: 2,
+        id: 1,
         advanceStatus: "open",
         component: "task-screen",
-        allow_interstitial: false,
-        elementDestination: {
-          type: 'taskSource',
-          value: 'taskSource',
-        },
-        user: {
-          id: 1
-        },
         screen: SingleScreen.screens[0],
         process_request: {
           id: 1,
@@ -859,17 +640,152 @@ describe("Task component", () => {
         }
       }
     );
-    
-    cy.socketEventNext("ProcessMaker\\Events\\RedirectTo", {
-      params: [{
-        nodeId: 'node_2',
-        tokenId: 2,
-        userId: 1,
-      }],
-      method: "redirectToTask"
+
+    cy.visit("/?scenario=TaskRedirect", {});
+
+    cy.wait(2000);
+    cy.get(".form-group").find("button").click();
+
+    cy.intercept("PUT", "http://localhost:5173/api/1.1/tasks/1").then(
+      function () {
+        const responseDataTask1 = {
+          status: "CLOSED",
+          process_request_id: 1,
+          id: 1,
+          screen: SingleScreen.screens[0],
+          allow_interstitial: false,
+          interstitial_screen: null
+        };
+
+        getTask(
+          `http://localhost:5173/api/1.1/tasks/${responseDataTask1.id}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`,
+          responseDataTask1
+        );
+
+        cy.wait(2000);
+        cy.reload();
+      }
+    );
+
+    cy.url().should("eq", "http://localhost:5173/tasks");
+  });
+
+  /* DNAT = Display Next Assigned Task
+   parentTask1_____________________endEvent
+     (DNAT)
+   After parentTask1 and not pending tasks should redirect to same request
+  */
+  it("Process without pending task should redirect to request", () => {
+    initializeTaskAndScreenIntercepts(
+      "GET",
+      "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
+      {
+        id: 1,
+        advanceStatus: "open",
+        component: "task-screen",
+        screen: SingleScreen.screens[0],
+        process_request: {
+          id: 1,
+          status: "ACTIVE"
+        }
+      }
+    );
+
+    cy.visit("/?scenario=TaskRedirect", {});
+
+    cy.wait(2000);
+    cy.get(".form-group").find("button").click();
+
+    cy.intercept("PUT", "http://localhost:5173/api/1.1/tasks/1").then(
+      function () {
+        const responseDataTask1 = {
+          status: "CLOSED",
+          process_request_id: 1,
+          id: 1,
+          screen: SingleScreen.screens[0],
+          allow_interstitial: true,
+          interstitial_screen: InterstitialScreen.screens[0]
+        };
+
+        getTask(
+          `http://localhost:5173/api/1.1/tasks/${responseDataTask1.id}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`,
+          responseDataTask1
+        );
+
+        getTasks(
+          "http://localhost:5173/api/1.1/tasks?user_id=1&status=ACTIVE&process_request_id=1&include_sub_tasks=1"
+        );
+      }
+    );
+
+    cy.socketEvent("ProcessMaker\\Events\\RedirectTo", {
+      requestId: 1,
+      event: "ACTIVITY_COMPLETED"
     });
+
+    cy.url().should("eq", "http://localhost:5173/requests/1");
+  });
+
+  /* DNAT = Display Next Assigned Task
+   parentTask1                           endEvent
+              \_______childTask1_______/
+                       (DNAT)
+   After childTask1 and not pending tasks should redirect to parent Request
+  */
+  it("Subprocess without pending task should redirect to parent request", () => {
+    initializeTaskAndScreenIntercepts(
+      "GET",
+      "http://localhost:5173/api/1.1/tasks/1?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination",
+      {
+        id: 1,
+        advanceStatus: "open",
+        component: "task-screen",
+        screen: SingleScreen.screens[0],
+        process_request: {
+          id: 2,
+          status: "ACTIVE",
+          parent_request_id: 1
+        },
+        user_request_permission: [{ process_request_id: 2, allowed: true }]
+      }
+    );
+
+    cy.visit("/?scenario=TaskRedirect", {});
+
     cy.wait(2000);
-    cy.url().should("eq", "http://localhost:5173/?scenario=TaskRedirect");
+    cy.get(".form-group").find("button").click();
+
+    cy.intercept("PUT", "http://localhost:5173/api/1.1/tasks/1").then(
+      function () {
+        const responseDataTask1 = {
+          status: "CLOSED",
+          process_request_id: 2,
+          parent_request_id: 3,
+          id: 1,
+          screen: SingleScreen.screens[0],
+          allow_interstitial: true,
+          interstitial_screen: InterstitialScreen.screens[0],
+          user_request_permission: [
+            { process_request_id: 3, allowed: true },
+            { process_request_id: 2, allowed: true }
+          ]
+        };
+
+        getTask(
+          `http://localhost:5173/api/1.1/tasks/${responseDataTask1.id}?include=data,user,draft,requestor,processRequest,component,screen,requestData,loopContext,bpmnTagName,interstitial,definition,nested,userRequestPermission,elementDestination`,
+          responseDataTask1
+        );
+
+        getTasks(
+          "http://localhost:5173/api/1.1/tasks?user_id=1&status=ACTIVE&process_request_id=1&include_sub_tasks=1"
+        );
+
+        cy.wait(2000);
+        cy.reload();
+      }
+    );
+
+    cy.url().should("eq", "http://localhost:5173/requests/3");
   });
 });