Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
4 changes: 0 additions & 4 deletions functions/venue.js
Original file line number Diff line number Diff line change
Expand Up @@ -358,10 +358,6 @@ const createBaseUpdateVenueData = (data, updated) => {
updated.showBadges = data.showBadges;
}

if (typeof data.showZendesk === "boolean") {
updated.showZendesk = data.showZendesk;
}

if (typeof data.showRangers === "boolean") {
updated.showRangers = data.showRangers;
}
Expand Down
6 changes: 0 additions & 6 deletions src/api/admin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ export type VenueInput = AdvancedVenueInput &
showRadio?: boolean;
radioStations?: string;
showNametags?: UsernameVisibility;
showZendesk?: boolean;
showUserStatus?: boolean;
};

Expand Down Expand Up @@ -236,11 +235,6 @@ const createFirestoreVenueInput = async (input: VenueInput, user: UserInfo) => {
rooms: [], // eventually we will be getting the rooms from the form
};

// Default to showing Zendesk
if (input.showZendesk === undefined) {
input.showZendesk = true;
}

return firestoreVenueInput;
};

Expand Down
2 changes: 0 additions & 2 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ import {
traceReactScheduler,
} from "utils/performance";
import { authSelector } from "utils/selectors";
import { initializeZendesk } from "utils/zendesk";

import { CustomSoundsProvider } from "hooks/sounds";
import { useSelector } from "hooks/useSelector";
Expand All @@ -74,7 +73,6 @@ import { ThemeProvider } from "styled-components";
import { theme } from "theme/theme";

activatePolyFills();
initializeZendesk();

if (LOGROCKET_APP_ID) {
LogRocket.init(LOGROCKET_APP_ID, {
Expand Down
9 changes: 0 additions & 9 deletions src/pages/Admin/AdvancedSettings/AdvancedSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ const validationSchema = Yup.object().shape<Venue_v2_AdvancedConfig>({
.notRequired(),
showRadio: Yup.bool().notRequired(),
showRangers: Yup.bool().notRequired(),
showZendesk: Yup.bool().notRequired(),

// TODO: Figure out how to validate with enum values
// roomVisibility: Yup.string().notRequired()
Expand Down Expand Up @@ -104,7 +103,6 @@ const AdvancedSettings: React.FC<AdvancedSettingsProps> = ({
showNametags: venue.showNametags,
showGrid: venue.showGrid,
showRadio: venue.showRadio,
showZendesk: venue.showZendesk,
showRangers: venue.showRangers,
bannerMessage: venue.bannerMessage,
attendeesTitle: venue.attendeesTitle,
Expand Down Expand Up @@ -316,13 +314,6 @@ const AdvancedSettings: React.FC<AdvancedSettingsProps> = ({

{renderShowNametags()}

<ToggleElement
forwardRef={register}
isChecked={values.showZendesk}
name="showZendesk"
title="Show Zendesk support popup"
/>

<ToggleElement
forwardRef={register}
isChecked={values.showRangers}
Expand Down
9 changes: 0 additions & 9 deletions src/pages/Admin/Venue/DetailsForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -685,14 +685,6 @@ const DetailsFormLeft: React.FC<DetailsFormLeftProps> = ({
</div>
);

// @debt pass the header into Toggler's 'label' prop instead of being external like this
const renderShowZendeskToggle = () => (
<div className="toggle-room">
<h4 className="italic input-header">Show Zendesk support popup</h4>
<Toggler name="showZendesk" forwardedRef={register} />
</div>
);

const renderSeatingNumberInput = () => (
<>
<div className="input-container">
Expand Down Expand Up @@ -1051,7 +1043,6 @@ const DetailsFormLeft: React.FC<DetailsFormLeftProps> = ({
renderShowGridToggle()}
{renderShowBadgesToggle()}
{renderShowNametagsToggle()}
{renderShowZendeskToggle()}
{templateID &&
HAS_REACTIONS_TEMPLATES.includes(templateID) &&
renderShowReactions()}
Expand Down
9 changes: 1 addition & 8 deletions src/pages/VenueEntrancePage/VenueEntrancePage.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import React from "react";
import { Redirect, useHistory, useParams } from "react-router-dom";

import { EntranceStepTemplate } from "types/EntranceStep";
Expand All @@ -7,7 +7,6 @@ import { withId } from "utils/id";
import { isCompleteProfile } from "utils/profile";
import { currentVenueSelectorData } from "utils/selectors";
import { venueEntranceUrl, venueInsideUrl } from "utils/url";
import { showZendeskWidget } from "utils/zendesk";

import useConnectCurrentVenue from "hooks/useConnectCurrentVenue";
import { useSelector } from "hooks/useSelector";
Expand All @@ -28,12 +27,6 @@ export const VenueEntrancePage: React.FunctionComponent<{}> = () => {
useConnectCurrentVenue();
const venue = useSelector(currentVenueSelectorData);

useEffect(() => {
if (venue?.showZendesk) {
showZendeskWidget();
}
}, [venue]);

if (!venue || !venueId) {
return <LoadingPage />;
}
Expand Down
7 changes: 0 additions & 7 deletions src/pages/VenueLandingPage/VenueLandingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import {
venueEventsSelector,
} from "utils/selectors";
import { hasEventFinished } from "utils/event";
import { showZendeskWidget } from "utils/zendesk";

import useConnectCurrentVenue from "hooks/useConnectCurrentVenue";
import { useSelector } from "hooks/useSelector";
Expand Down Expand Up @@ -102,12 +101,6 @@ export const VenueLandingPage: React.FC = () => {
}
}, [shouldOpenPaymentModal, isAuthenticationModalOpen]);

useEffect(() => {
if (venue?.showZendesk) {
showZendeskWidget();
}
}, [venue]);

if (venueRequestStatus && !venue) {
return <>This venue does not exist</>;
}
Expand Down
8 changes: 1 addition & 7 deletions src/pages/VenuePage/VenuePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
useUpdateTimespentPeriodically,
} from "utils/userLocation";
import { venueEntranceUrl } from "utils/url";
import { showZendeskWidget } from "utils/zendesk";

import { tracePromise } from "utils/performance";
import { isCompleteProfile, updateProfileEnteredVenueIds } from "utils/profile";
import { isTruthy } from "utils/types";
Expand Down Expand Up @@ -179,12 +179,6 @@ export const VenuePage: React.FC = () => {
}
}, [user, profile, venueId, venueTemplate, mixpanel]);

useEffect(() => {
if (venue?.showZendesk) {
showZendeskWidget();
}
}, [venue]);

// const handleAccessDenied = useCallback(() => setIsAccessDenied(true), []);

// useVenueAccess(venue, handleAccessDenied);
Expand Down
1 change: 0 additions & 1 deletion src/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,6 @@ export const DEFAULT_SHOW_SHOUTOUTS = true;

export const DEFAULT_SHOW_USER_STATUSES = true;

export const ZENDESK_URL_PREFIXES = ["/admin"];

export const REACTIONS_CONTAINER_HEIGHT_IN_SEATS = 2;

Expand Down
2 changes: 0 additions & 2 deletions src/types/venues.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ export interface Venue_v2_AdvancedConfig {
showNametags?: UsernameVisibility;
showRadio?: boolean;
showRangers?: boolean;
showZendesk?: boolean;
}

export interface Venue_v2_EntranceConfig {
Expand Down Expand Up @@ -179,7 +178,6 @@ export interface BaseVenue {
showRadio?: boolean;
showBadges?: boolean;
showNametags?: UsernameVisibility;
showZendesk?: boolean;
showUserStatus?: boolean;
}

Expand Down
13 changes: 0 additions & 13 deletions src/utils/loadScript.ts

This file was deleted.

42 changes: 0 additions & 42 deletions src/utils/zendesk.ts

This file was deleted.