2024-03-08 13:58:02 +00:00
1 changed files with 22 additions and 12 deletions
@@ -252,25 +252,35 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                      disabled={props.isSubmitting}
                      className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full transition duration-150 ease-in-out flex items-center"
                    >
-                      {pathname !== "/manage-family" ||
-                      pathname === "/acc-family/activities" ? (
+                      {pathname === "/acc-family/activities" ? (
                        <>
-                          {submitTask.loading
-                            ? "Submitting Task"
-                            : submitTask.state === "success"
-                            ? "Task Submitted"
-                            : submitTask.state === "bad"
-                            ? "An Error Occurred"
-                            : "Send to Parents"}
+                          {" "}
+                          <>
+                            Continue <Icons name="chevron-right" />
+                          </>
                        </>
                      ) : (
                        <>
-                          {suggestedNextStep === "Send Task" ? (
+                          {pathname !== "/manage-family" ? (
                            <>
-                              Continue <Icons name="chevron-right" />
+                              {submitTask.loading
+                                ? "Submitting Task"
+                                : submitTask.state === "success"
+                                ? "Task Submitted"
+                                : submitTask.state === "bad"
+                                ? "An Error Occurred"
+                                : "Send to Parents"}
                            </>
                          ) : (
-                            "Complete"
+                            <>
+                              {suggestedNextStep === "Send Task" ? (
+                                <>
+                                  Continue <Icons name="chevron-right" />
+                                </>
+                              ) : (
+                                "Complete"
+                              )}
+                            </>
                          )}
                        </>
                      )}