diff --git a/src/scenes/Dashboard/components/TasksGrid.js b/src/scenes/Dashboard/components/TasksGrid.js index 4739b3ec..903afd59 100644 --- a/src/scenes/Dashboard/components/TasksGrid.js +++ b/src/scenes/Dashboard/components/TasksGrid.js @@ -9,7 +9,6 @@ import { useSelector } from "react-redux"; import { Divider, useMediaQuery } from "@mui/material"; import { useTheme } from "@mui/material/styles"; import * as models from "../../../models"; -import useIsPaidSubscription from "../../../hooks/useIsPaidSubscription"; const getColumnTitle = (key) => { if (key.includes(models.TaskStatus.DROPPED_OFF)) @@ -50,7 +49,6 @@ const useStyles = makeStyles()((theme) => ({ function TasksGrid(props) { const { classes } = useStyles(); - const isPaid = useIsPaidSubscription(); const dashboardFilteredUser = useSelector(dashboardFilteredUserSelector); const theme = useTheme(); @@ -72,12 +70,9 @@ function TasksGrid(props) { [models.TaskStatus.ABANDONED], [models.TaskStatus.REJECTED], [models.TaskStatus.PENDING], + [models.TaskStatus.FUTURE], ]; - if (isPaid) { - columns.push([models.TaskStatus.FUTURE]); - } - const columnCount = columns.filter( (column) => _.intersection(excludeList, column).length === 0 ).length; diff --git a/src/scenes/GuidedSetup/components/PickUpAndDeliverDetails.tsx b/src/scenes/GuidedSetup/components/PickUpAndDeliverDetails.tsx index 8853b0db..c6df2d22 100644 --- a/src/scenes/GuidedSetup/components/PickUpAndDeliverDetails.tsx +++ b/src/scenes/GuidedSetup/components/PickUpAndDeliverDetails.tsx @@ -6,7 +6,6 @@ import { useTheme } from "@mui/material/styles"; import PickUpAndDeliverSchedule, { Schedule, } from "../../../scenes/sharedTaskComponents/PickUpAndDeliverSchedule"; -import useIsPaidSubscription from "../../../hooks/useIsPaidSubscription"; type PickUpAndDeliverDetailsProps = { onSetPickUpLocation: (location: any) => void; @@ -38,7 +37,6 @@ export const PickUpAndDeliverDetails: React.FC< const theme = useTheme(); const [pickUpOpen, setPickUpOpen] = React.useState(false); const [dropOffOpen, setDropOffOpen] = React.useState(false); - const isPaid = useIsPaidSubscription(); const handlePickUpScheduleConfirm = (newValue: Schedule | null) => { onSetSchedule({ ...schedule, pickUp: newValue }); }; @@ -94,17 +92,15 @@ export const PickUpAndDeliverDetails: React.FC< onClear={onClearPickUpLocation} override={overrides.pickUpLocation} /> - {isPaid && ( - setPickUpOpen(false)} - key={pickUpOpen ? "pick-up" : "pick-up-2"} - open={pickUpOpen} - handleOpen={() => setPickUpOpen(true)} - /> - )} + setPickUpOpen(false)} + key={pickUpOpen ? "pick-up" : "pick-up-2"} + open={pickUpOpen} + handleOpen={() => setPickUpOpen(true)} + /> Where to? - {isPaid && ( - setDropOffOpen(false)} - initialSchedule={schedule.dropOff} - key={dropOffOpen ? "drop-off" : "drop-off-2"} - open={dropOffOpen} - handleOpen={() => setDropOffOpen(true)} - /> - )} + setDropOffOpen(false)} + initialSchedule={schedule.dropOff} + key={dropOffOpen ? "drop-off" : "drop-off-2"} + open={dropOffOpen} + handleOpen={() => setDropOffOpen(true)} + /> ); }; diff --git a/src/scenes/sharedTaskComponents/LocationDetailsPanel.tsx b/src/scenes/sharedTaskComponents/LocationDetailsPanel.tsx index 47cf5efe..e9c8a29c 100644 --- a/src/scenes/sharedTaskComponents/LocationDetailsPanel.tsx +++ b/src/scenes/sharedTaskComponents/LocationDetailsPanel.tsx @@ -24,7 +24,6 @@ import { } from "../../API"; import { TaskScheduleDetails } from "./TaskScheduleDetails"; import useModelSubscription from "../../hooks/useModelSubscription"; -import useIsPaidSubscription from "../../hooks/useIsPaidSubscription"; export const protectedFields = [ "id", @@ -71,7 +70,6 @@ const LocationDetailsPanel = ({ // I have no idea why the imported selector is undefined here // @ts-ignore const tenantId = useSelector((state) => state.tenantId); - const isPaid = useIsPaidSubscription(); const [state, setState] = useState(null); const [editMode, setEditMode] = useState(false); const [errorState, setErrorState] = useState(false); @@ -670,18 +668,14 @@ const LocationDetailsPanel = ({ )} {contents} - {(isPaid || schedule) && ( - <> - - - - )} + + { @@ -45,8 +44,6 @@ export const TaskScheduleDetails: React.FC = ({ null ); - const isPaid = useIsPaidSubscription(); - const handleClear = () => { onClear(); setConfirmClear(false); @@ -98,11 +95,9 @@ export const TaskScheduleDetails: React.FC = ({ setConfirmClear(true)}> - {isPaid && ( - - - - )} + + + )} diff --git a/src/utilities/duplicateTask.ts b/src/utilities/duplicateTask.ts index bb3a6b8d..24c064e5 100644 --- a/src/utilities/duplicateTask.ts +++ b/src/utilities/duplicateTask.ts @@ -1,4 +1,4 @@ -import { Auth, DataStore } from "aws-amplify"; +import { DataStore } from "aws-amplify"; import _ from "lodash"; import * as models from "../models"; @@ -21,10 +21,6 @@ export default async function duplicateTask( if (!tenantId) throw new Error("tenantId must exist"); if (!task) throw new Error("task must exist"); if (!createdById) throw new Error("createdById must exist"); - const user = await Auth.currentSession(); - const accessToken = user.getAccessToken(); - const groups = accessToken.payload["cognito:groups"]; - const isPaid = groups.includes("PAID"); let { id, updatedAt, @@ -38,17 +34,10 @@ export default async function duplicateTask( establishmentLocation, dropOffLocation, pickUpLocation, - pickUpSchedule, - dropOffSchedule, createdBy, ...rest } = { ...task }; - if (!isPaid) { - pickUpSchedule = null; - dropOffSchedule = null; - } - const author = await DataStore.query(models.User, createdById); if (!author) throw new Error("author not found"); if (pickUpLocation?.listed === 0) {