diff --git a/src/components/FamilyPopup/SuggestTask.jsx b/src/components/FamilyPopup/SuggestTask.jsx index 065ab41..04e48d6 100644 --- a/src/components/FamilyPopup/SuggestTask.jsx +++ b/src/components/FamilyPopup/SuggestTask.jsx @@ -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 + ) : ( <> - {suggestedNextStep === "Send Task" ? ( + {pathname !== "/manage-family" ? ( <> - Continue + {submitTask.loading + ? "Submitting Task" + : submitTask.state === "success" + ? "Task Submitted" + : submitTask.state === "bad" + ? "An Error Occurred" + : "Send to Parents"} ) : ( - "Complete" + <> + {suggestedNextStep === "Send Task" ? ( + <> + Continue + + ) : ( + "Complete" + )} + )} )}