From 95da1c3505997cac4613b95e4bef3b3a6feb8b4a Mon Sep 17 00:00:00 2001
From: Vainakh <adlanyandarbiev@gmail.com>
Date: Sun, 12 May 2024 18:27:09 -0600
Subject: [PATCH 1/8] #1267 Remove Feedback Feature

---
 app/components/listing/ActionBar.tsx          |   2 +-
 app/components/listing/FeedbackModal.tsx      |  28 ----
 .../listing/feedback/FeedbackForm.module.scss |  50 ------
 .../listing/feedback/FeedbackForm.tsx         | 139 -----------------
 .../feedback/FeedbackSteps.module.scss        | 130 ----------------
 .../listing/feedback/FeedbackSteps.tsx        | 144 ------------------
 app/components/listing/feedback/constants.ts  |  35 -----
 app/models/Organization.ts                    |   4 -
 8 files changed, 1 insertion(+), 531 deletions(-)
 delete mode 100644 app/components/listing/FeedbackModal.tsx
 delete mode 100644 app/components/listing/feedback/FeedbackForm.module.scss
 delete mode 100644 app/components/listing/feedback/FeedbackForm.tsx
 delete mode 100644 app/components/listing/feedback/FeedbackSteps.module.scss
 delete mode 100644 app/components/listing/feedback/FeedbackSteps.tsx
 delete mode 100644 app/components/listing/feedback/constants.ts

diff --git a/app/components/listing/ActionBar.tsx b/app/components/listing/ActionBar.tsx
index 15325c05a..ae2760e36 100644
--- a/app/components/listing/ActionBar.tsx
+++ b/app/components/listing/ActionBar.tsx
@@ -20,7 +20,7 @@ const ActionButton = ({
   const content = (
     <>
       <img
-        className="action-sidebar--icon"
+        className=""
         src={iconPath(`${icon}-${iconColor}`)}
         alt={icon}
       />
diff --git a/app/components/listing/FeedbackModal.tsx b/app/components/listing/FeedbackModal.tsx
deleted file mode 100644
index e96efa441..000000000
--- a/app/components/listing/FeedbackModal.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from "react";
-import Modal from "react-modal";
-import { Organization, Service } from "../../models";
-import { FeedbackForm } from "./feedback/FeedbackForm";
-
-export const FeedbackModal = ({
-  organization,
-  service,
-  isOpen,
-  setIsOpen,
-}: {
-  isOpen: boolean;
-  setIsOpen: (val: boolean) => void;
-  organization: Organization;
-  service?: Service;
-}) => (
-  <Modal
-    isOpen={isOpen}
-    className="feedback__Modal"
-    overlayClassName="feedback__Overlay"
-  >
-    <FeedbackForm
-      closeModal={() => setIsOpen(!isOpen)}
-      resource={organization}
-      service={service}
-    />
-  </Modal>
-);
diff --git a/app/components/listing/feedback/FeedbackForm.module.scss b/app/components/listing/feedback/FeedbackForm.module.scss
deleted file mode 100644
index ae0fb0300..000000000
--- a/app/components/listing/feedback/FeedbackForm.module.scss
+++ /dev/null
@@ -1,50 +0,0 @@
-@import "../../../styles/utils/colors";
-
-.feedbackModalBody {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  text-align: center;
-}
-.closeModal {
-  position: absolute;
-  right: 25px;
-  top: 15px;
-  cursor: pointer;
-  @media screen and (max-width: 767px) {
-    top: 45px;
-  }
-}
-
-.feedbackHeader {
-  font-weight: 600;
-  font-size: 20px;
-  color: $color-brand;
-  @media screen and (max-width: 767px) {
-    width: 100%;
-    text-align: start;
-  }
-}
-
-.feedbackSubheader {
-  width: 200px;
-  font-size: 15px;
-  @media screen and (max-width: 767px) {
-    width: 100%;
-    margin-top: 5px;
-    text-align: start;
-    font-size: 16px;
-    font-weight: bold;
-  }
-}
-
-.stepsContainer {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  @media screen and (max-width: 767px) {
-    height: 450px;
-    justify-content: center;
-    margin-top: 10px;
-  }
-}
diff --git a/app/components/listing/feedback/FeedbackForm.tsx b/app/components/listing/feedback/FeedbackForm.tsx
deleted file mode 100644
index b77ed95d6..000000000
--- a/app/components/listing/feedback/FeedbackForm.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import React, { useState } from "react";
-import { cloneDeep } from "lodash";
-import { icon } from "assets";
-import { TAG_LIST } from "./constants";
-import type { StepState, SubmittedState, TagType, VoteType } from "./constants";
-import { Organization, Service } from "../../../models";
-import { addFeedback } from "../../../utils/DataService";
-import {
-  VoteButtons,
-  FeedbackTags,
-  Review,
-  SubmitMessage,
-  NavigationButtons,
-} from "./FeedbackSteps";
-import styles from "./FeedbackForm.module.scss";
-
-export const FeedbackForm = ({
-  service,
-  resource,
-  closeModal,
-}: {
-  service?: Service;
-  resource: Organization;
-  closeModal: () => void;
-}) => {
-  const [vote, setVote] = useState<VoteType>("neither");
-  const [tagOptions, setTags] = useState<readonly TagType[]>(TAG_LIST);
-  const [review, setReview] = useState("");
-  const [step, setStep] = useState<StepState>("start");
-  const [isSubmitted, setIsSubmitted] = useState<SubmittedState>(null);
-  const handleVoteChange = (voteType: VoteType) => {
-    setStep("start");
-    setVote(voteType);
-  };
-
-  /**
-   * Toggle selected tags state with given position
-   *
-   * @param {int} pos - position of tag in array of tagOptions.
-   */
-  const toggleSelectedTag = (pos: number) => {
-    const updatedTags = cloneDeep(tagOptions);
-    updatedTags[pos].selected = !updatedTags[pos].selected;
-    setTags(updatedTags);
-  };
-
-  const handleReviewChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
-    e.preventDefault();
-    setReview(e.target.value);
-  };
-
-  const handleNextStep = () =>
-    vote === "downvote" && step === "start"
-      ? setStep("tags")
-      : setStep("review");
-
-  const handlePrevStep = () =>
-    vote === "downvote" && step === "review"
-      ? setStep("tags")
-      : setStep("start");
-
-  const handleSubmit = () => {
-    setIsSubmitted("submitting");
-    const tags = tagOptions
-      .filter(({ selected }) => selected)
-      .map(({ tag }) => tag);
-
-    const feedback = {
-      rating: vote,
-      tags,
-      review,
-    };
-
-    const [source, sourceId] = !service
-      ? (["resources", resource.id] as const)
-      : (["services", service.id] as const);
-
-    addFeedback(source, sourceId, feedback)
-      .then(() => {
-        setIsSubmitted("submitted");
-      })
-      .catch((err) => console.log(err)); // eslint-disable-line no-console
-  };
-
-  const isReviewRequired =
-    tagOptions.some(({ tag, selected }) => tag === "Other" && selected) &&
-    vote === "downvote";
-
-  const STEPS = {
-    start: null,
-    tags: (
-      <FeedbackTags tagOptions={tagOptions} onSelectTag={toggleSelectedTag} />
-    ),
-    review: (
-      <Review
-        reviewValue={review}
-        isReviewRequired={isReviewRequired}
-        onReviewChange={handleReviewChange}
-      />
-    ),
-  };
-
-  return (
-    <div className={styles.feedbackModalBody}>
-      <div
-        className={styles.closeModal}
-        role="button"
-        tabIndex={0}
-        onClick={closeModal}
-      >
-        <img src={icon("close")} alt="close" />
-      </div>
-      <div className={styles.feedbackHeader}>
-        <img src={icon("feedback-blue-header")} alt="feedback" />
-        <span>Share your Feedback</span>
-      </div>
-      <div className={styles.feedbackSubheader}>
-        The team usually replies within a day.
-      </div>
-      {isSubmitted === "submitted" ? (
-        <SubmitMessage closeModal={closeModal} />
-      ) : (
-        <div className={styles.stepsContainer}>
-          <VoteButtons vote={vote} onVoteChange={handleVoteChange} />
-          {STEPS[step]}
-          <NavigationButtons
-            step={step}
-            vote={vote}
-            onPrevStep={handlePrevStep}
-            onNextStep={handleNextStep}
-            onSubmit={handleSubmit}
-            isReviewRequired={isReviewRequired}
-            isSubmitted={isSubmitted}
-          />
-        </div>
-      )}
-    </div>
-  );
-};
diff --git a/app/components/listing/feedback/FeedbackSteps.module.scss b/app/components/listing/feedback/FeedbackSteps.module.scss
deleted file mode 100644
index e990227f6..000000000
--- a/app/components/listing/feedback/FeedbackSteps.module.scss
+++ /dev/null
@@ -1,130 +0,0 @@
-@import "../../../styles/utils/colors";
-
-.voteIcons {
-  display: flex;
-  justify-content: space-between;
-  width: 110px;
-  height: 35px;
-  margin-top: 15px;
-  img {
-    cursor: pointer;
-  }
-}
-
-.stepsPrompt {
-  font-weight: 600;
-  margin-top: 20px;
-  font-size: 18px;
-  line-height: 1.5;
-  @media screen and (max-width: 767px) {
-    font-weight: bold;
-    margin-bottom: 15px;
-  }
-}
-.votePrompt {
-  @media screen and (max-width: 767px) {
-    width: 215px;
-  }
-}
-
-.feedbackTags {
-  margin-top: 10px;
-}
-
-.feedbackTagsContainer {
-  display: flex;
-  flex-wrap: wrap;
-}
-
-.feedbackTag {
-  flex: 1 0 auto;
-  border: 2px solid $color-brand;
-  box-sizing: border-box;
-  border-radius: 20px;
-  cursor: pointer;
-  margin: 10px;
-  padding: 7px 24px;
-  color: $color-brand;
-  font-weight: 600;
-  font-size: 16px;
-  @media screen and (max-width: 767px) {
-    margin: 10px;
-    padding: 8px 15px;
-    font-size: 18px;
-  }
-}
-
-.selectedTag {
-  color: $color-white;
-  background: $color-brand;
-}
-
-.feedbackReview {
-  margin-top: 10px;
-}
-.feedbackTextarea {
-  resize: none !important;
-  width: 450px;
-  height: 165px;
-  margin-top: 10px;
-  background: $color-grey1;
-  border: 2px solid $color-brand;
-  box-sizing: border-box;
-  border-radius: 20px;
-  &::-webkit-scrollbar {
-    width: 0%;
-  }
-  @media screen and (max-width: 767px) {
-    max-width: 350px;
-    height: 180px;
-    margin-top: 7px;
-  }
-}
-
-.feedbackSubmitHeader {
-  font-weight: 600;
-  font-size: 24px;
-  line-height: 33px;
-  margin-top: 3.5em;
-}
-
-.feedbackSubmitSubheader {
-  font-size: 18px;
-  line-height: 25px;
-  margin-top: 15px;
-  width: 80%;
-  margin-bottom: 3.5em;
-  @media screen and (max-width: 767px) {
-    font-weight: 600;
-  }
-}
-
-.navButtonsContainer {
-  display: flex;
-  justify-content: space-between;
-  width: 340px;
-  margin-top: 30px;
-  @media screen and (max-width: 767px) {
-    position: absolute;
-    bottom: 40px;
-  }
-}
-
-.navButtons {
-  background: $color-brand;
-  width: 150px;
-  border-radius: 3px;
-  &:disabled {
-    opacity: 0.5;
-  }
-  &:only-child {
-    margin: 0 auto;
-  }
-}
-
-.backButton {
-  composes: navButtons;
-  background: $color-white;
-  border: 2px solid $color-brand;
-  color: $color-brand;
-}
diff --git a/app/components/listing/feedback/FeedbackSteps.tsx b/app/components/listing/feedback/FeedbackSteps.tsx
deleted file mode 100644
index c4ad49c55..000000000
--- a/app/components/listing/feedback/FeedbackSteps.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-import React from "react";
-
-import { icon } from "assets";
-import type { SubmittedState, StepState, TagType, VoteType } from "./constants";
-import styles from "./FeedbackSteps.module.scss";
-
-export const VoteButtons = ({
-  vote,
-  onVoteChange,
-}: {
-  vote: VoteType;
-  onVoteChange: (v: VoteType) => void;
-}) => (
-  <>
-    <div className={`${styles.stepsPrompt} ${styles.votePrompt}`}>
-      How was your experience on this site?
-    </div>
-    <div className={styles.voteIcons}>
-      <div onClick={() => onVoteChange("upvote")} role="button" tabIndex={-1}>
-        <img
-          src={icon(`upvote${vote === "upvote" ? "-active" : ""}`)}
-          alt="upvote"
-        />
-      </div>
-      <div onClick={() => onVoteChange("downvote")} role="button" tabIndex={-2}>
-        <img
-          src={icon(`downvote${vote === "downvote" ? "-active" : ""}`)}
-          alt="downvote"
-        />
-      </div>
-    </div>
-  </>
-);
-
-export const FeedbackTags = ({
-  tagOptions,
-  onSelectTag,
-}: {
-  tagOptions: readonly TagType[];
-  onSelectTag: (i: number) => void;
-}) => (
-  <div className={styles.feedbackTags}>
-    <div className={styles.stepsPrompt}>What can be improved?</div>
-    <div className={styles.feedbackTagsContainer}>
-      {tagOptions.map(({ tag, selected }, pos) => {
-        const selectedStyle = selected ? styles.selectedTag : "";
-        return (
-          <div
-            key={tag}
-            role="button"
-            tabIndex={0}
-            className={`${styles.feedbackTag} ${selectedStyle}`}
-            onClick={() => onSelectTag(pos)}
-          >
-            {tag}
-          </div>
-        );
-      })}
-    </div>
-  </div>
-);
-
-export const Review = ({
-  reviewValue,
-  onReviewChange,
-  isReviewRequired,
-}: {
-  reviewValue: string;
-  onReviewChange: (e: React.ChangeEvent<HTMLTextAreaElement>) => void;
-  isReviewRequired: boolean;
-}) => (
-  <div className={styles.feedbackReview}>
-    <div className={styles.stepsPrompt}>
-      Please provide your feedback below:
-    </div>
-    <textarea
-      className={styles.feedbackTextarea}
-      placeholder={`Type your feedback here ${
-        !isReviewRequired ? "(optional)" : ""
-      }`}
-      value={reviewValue}
-      onChange={onReviewChange}
-    />
-  </div>
-);
-
-export const SubmitMessage = ({ closeModal }: { closeModal: () => void }) => (
-  <>
-    <div className={styles.feedbackSubmitHeader}>
-      Thank you for your feedback!
-    </div>
-    <div className={styles.feedbackSubmitSubheader}>
-      Your feedback will help us continue to improve this guide.
-    </div>
-    <button type="button" className={styles.navButtons} onClick={closeModal}>
-      Close
-    </button>
-  </>
-);
-
-export const NavigationButtons = ({
-  step,
-  vote,
-  onPrevStep,
-  onNextStep,
-  onSubmit,
-  isReviewRequired,
-  isSubmitted,
-}: {
-  step: StepState;
-  vote: VoteType;
-  onPrevStep: () => void;
-  onNextStep: () => void;
-  onSubmit: () => void;
-  isReviewRequired: boolean;
-  isSubmitted: SubmittedState;
-}) => (
-  <div className={styles.navButtonsContainer}>
-    {step !== "start" && (
-      <button type="button" className={styles.backButton} onClick={onPrevStep}>
-        Back
-      </button>
-    )}
-    {step === "review" ? (
-      <button
-        type="button"
-        className={styles.navButtons}
-        disabled={isReviewRequired || isSubmitted === "submitting"}
-        onClick={onSubmit}
-      >
-        {isSubmitted === "submitting" ? "Submitting..." : "Submit"}
-      </button>
-    ) : (
-      <button
-        type="button"
-        className={styles.navButtons}
-        onClick={onNextStep}
-        disabled={vote === "neither"}
-      >
-        Next
-      </button>
-    )}
-  </div>
-);
diff --git a/app/components/listing/feedback/constants.ts b/app/components/listing/feedback/constants.ts
deleted file mode 100644
index 9ef30bc7f..000000000
--- a/app/components/listing/feedback/constants.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-export interface TagType {
-  tag: string;
-  selected: boolean;
-}
-
-export const TAG_LIST = [
-  {
-    tag: "Contact Information",
-    selected: false,
-  },
-  {
-    tag: "Hours",
-    selected: false,
-  },
-  {
-    tag: "Address",
-    selected: false,
-  },
-  {
-    tag: "Website Link",
-    selected: false,
-  },
-  {
-    tag: "Information missing",
-    selected: false,
-  },
-  {
-    tag: "Other",
-    selected: false,
-  },
-] as const;
-
-export type VoteType = "upvote" | "downvote" | "neither";
-export type StepState = "start" | "tags" | "review";
-export type SubmittedState = "submitting" | "submitted" | null;
diff --git a/app/models/Organization.ts b/app/models/Organization.ts
index cfd7a6611..b399c736d 100644
--- a/app/models/Organization.ts
+++ b/app/models/Organization.ts
@@ -98,10 +98,6 @@ export const getOrganizationActions = (
       name: "Print",
       icon: "print",
     },
-    {
-      name: "Share Feedback",
-      icon: "feedback",
-    },
   ];
 
   if (phoneNumber) {

From d0d629acf0d738fa1ec7654f374093f2f35e5488 Mon Sep 17 00:00:00 2001
From: Vainakh <adlanyandarbiev@gmail.com>
Date: Sun, 12 May 2024 18:30:57 -0600
Subject: [PATCH 2/8] #1267 Add back className

---
 app/components/listing/ActionBar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/listing/ActionBar.tsx b/app/components/listing/ActionBar.tsx
index ae2760e36..15325c05a 100644
--- a/app/components/listing/ActionBar.tsx
+++ b/app/components/listing/ActionBar.tsx
@@ -20,7 +20,7 @@ const ActionButton = ({
   const content = (
     <>
       <img
-        className=""
+        className="action-sidebar--icon"
         src={iconPath(`${icon}-${iconColor}`)}
         alt={icon}
       />

From 9b1e8459e34ab02aee04245276ee78b9b0b0ee40 Mon Sep 17 00:00:00 2001
From: Vainakh <adlanyandarbiev@gmail.com>
Date: Sun, 12 May 2024 18:37:27 -0600
Subject: [PATCH 3/8] #1267 Remove import references

---
 app/components/listing/index.tsx |  1 -
 app/utils/DataService.ts         | 15 ---------------
 2 files changed, 16 deletions(-)

diff --git a/app/components/listing/index.tsx b/app/components/listing/index.tsx
index 072f4dbf0..9f417bede 100644
--- a/app/components/listing/index.tsx
+++ b/app/components/listing/index.tsx
@@ -1,5 +1,4 @@
 export * from "./ActionBar";
-export * from "./FeedbackModal";
 export * from "./ListingTitleLink";
 export * from "./MapOfLocations";
 export * from "./MOHCDBadge";
diff --git a/app/utils/DataService.ts b/app/utils/DataService.ts
index 303781131..bef28e194 100644
--- a/app/utils/DataService.ts
+++ b/app/utils/DataService.ts
@@ -1,7 +1,5 @@
 import * as _ from "lodash";
 
-import type { VoteType } from "../components/listing/feedback/constants";
-
 function setAuthHeaders(resp: Response): void {
   const { headers } = resp;
   if (headers.get("access-token") && headers.get("client")) {
@@ -116,18 +114,5 @@ export function APIDelete(
   });
 }
 
-interface FeedbackBody {
-  rating: VoteType;
-  tags: string[];
-  review: string;
-}
-
-export const addFeedback = (
-  source: "resources" | "services",
-  sourceId: number,
-  body: FeedbackBody
-): Promise<Response> =>
-  post(`/api/${source}/${sourceId}/feedbacks`, body).then((res) => res.json());
-
 export const getResourceCount = (): Promise<number> =>
   get("/api/resources/count");

From f8f4fb399658187f223dd6f640995a6428ad6557 Mon Sep 17 00:00:00 2001
From: Vainakh <adlanyandarbiev@gmail.com>
Date: Sun, 12 May 2024 18:50:44 -0600
Subject: [PATCH 4/8] #1267 Remove import references in addition

---
 app/pages/OrganizationListingPage.tsx | 1 -
 app/pages/ServiceListingPage.tsx      | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/pages/OrganizationListingPage.tsx b/app/pages/OrganizationListingPage.tsx
index 2e759e233..ed83410b9 100644
--- a/app/pages/OrganizationListingPage.tsx
+++ b/app/pages/OrganizationListingPage.tsx
@@ -7,7 +7,6 @@ import {
   ActionBarMobile,
   ActionSidebar,
   AddressInfoRenderer,
-  FeedbackModal,
   EmailRenderer,
   MapOfLocations,
   MOHCDBadge,
diff --git a/app/pages/ServiceListingPage.tsx b/app/pages/ServiceListingPage.tsx
index 8222217e2..e1f91c4de 100644
--- a/app/pages/ServiceListingPage.tsx
+++ b/app/pages/ServiceListingPage.tsx
@@ -6,7 +6,6 @@ import qs from "qs";
 import {
   ActionBarMobile,
   ActionSidebar,
-  FeedbackModal,
   ListingTitleLink,
   MapOfLocations,
   MOHCDBadge,
@@ -31,7 +30,7 @@ const { title: whiteLabelTitle, footerOptions: whiteLabelFooterOpts } =
   whiteLabel;
 
 // Page at /services/123
-export const ServiceListingPage = () => {
+export const tingPage = () => {
   const { id } = useParams<{ id: string }>();
   const [service, setService] = useState<Service | null>(null);
   const [feedbackModalOpen, setFeedbackModalOpen] = useState(false);

From db0bc1f483458c5e9cc860fa6cb670d5bf252394 Mon Sep 17 00:00:00 2001
From: Vainakh <adlanyandarbiev@gmail.com>
Date: Sun, 12 May 2024 19:00:28 -0600
Subject: [PATCH 5/8] #1267 Replace import statement in ServiceListingPage.tsx

---
 app/pages/ServiceListingPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/pages/ServiceListingPage.tsx b/app/pages/ServiceListingPage.tsx
index e1f91c4de..b30c82b3b 100644
--- a/app/pages/ServiceListingPage.tsx
+++ b/app/pages/ServiceListingPage.tsx
@@ -30,7 +30,7 @@ const { title: whiteLabelTitle, footerOptions: whiteLabelFooterOpts } =
   whiteLabel;
 
 // Page at /services/123
-export const tingPage = () => {
+export const ServiceListingPage = () => {
   const { id } = useParams<{ id: string }>();
   const [service, setService] = useState<Service | null>(null);
   const [feedbackModalOpen, setFeedbackModalOpen] = useState(false);

From a3a06d15484a4202d1318d14002429935df7f382 Mon Sep 17 00:00:00 2001
From: Vainakh <adlanyandarbiev@gmail.com>
Date: Sun, 12 May 2024 19:06:24 -0600
Subject: [PATCH 6/8] #1267 Remove unused references in the components.

---
 app/pages/OrganizationListingPage.tsx | 6 ------
 app/pages/ServiceListingPage.tsx      | 7 -------
 2 files changed, 13 deletions(-)

diff --git a/app/pages/OrganizationListingPage.tsx b/app/pages/OrganizationListingPage.tsx
index ed83410b9..0351b09e9 100644
--- a/app/pages/OrganizationListingPage.tsx
+++ b/app/pages/OrganizationListingPage.tsx
@@ -166,12 +166,6 @@ export const OrganizationListingPage = () => {
                 />
               </OrganizationSubheaderSection>
             )}
-
-            <FeedbackModal
-              isOpen={feedbackModalOpen}
-              setIsOpen={setFeedbackModalOpen}
-              organization={org}
-            />
           </div>
 
           <div className="org--aside">
diff --git a/app/pages/ServiceListingPage.tsx b/app/pages/ServiceListingPage.tsx
index b30c82b3b..9ba90b48f 100644
--- a/app/pages/ServiceListingPage.tsx
+++ b/app/pages/ServiceListingPage.tsx
@@ -180,13 +180,6 @@ export const ServiceListingPage = () => {
                 <h2>Similar Services Near You</h2>
               </section>
             */}
-
-            <FeedbackModal
-              isOpen={feedbackModalOpen}
-              setIsOpen={setFeedbackModalOpen}
-              service={service}
-              organization={resource}
-            />
           </div>
           <div className="listing--aside">
             <ActionSidebar

From 6baf34b1ca299f258d6a0edb501c8567f3b91428 Mon Sep 17 00:00:00 2001
From: Vainakh <adlanyandarbiev@gmail.com>
Date: Sun, 12 May 2024 19:10:46 -0600
Subject: [PATCH 7/8] #1267 remove remaining modal code

---
 app/pages/OrganizationListingPage.tsx | 4 ----
 app/pages/ServiceListingPage.tsx      | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/app/pages/OrganizationListingPage.tsx b/app/pages/OrganizationListingPage.tsx
index 0351b09e9..bb8267dd0 100644
--- a/app/pages/OrganizationListingPage.tsx
+++ b/app/pages/OrganizationListingPage.tsx
@@ -32,7 +32,6 @@ import {
 export const OrganizationListingPage = () => {
   const { id } = useParams<{ id: string }>();
   const [org, setOrg] = useState<Organization | null>(null);
-  const [feedbackModalOpen, setFeedbackModalOpen] = useState(false);
   const { search } = useLocation();
   const searchState = useMemo(() => qs.parse(search.slice(1)), [search]);
   const { visitDeactivated } = searchState;
@@ -59,9 +58,6 @@ export const OrganizationListingPage = () => {
   );
   const onClickAction = (action: OrganizationAction) => {
     switch (action.icon) {
-      case "feedback":
-        setFeedbackModalOpen(true);
-        break;
       case "print":
         window.print();
         break;
diff --git a/app/pages/ServiceListingPage.tsx b/app/pages/ServiceListingPage.tsx
index 9ba90b48f..5b8f58a3a 100644
--- a/app/pages/ServiceListingPage.tsx
+++ b/app/pages/ServiceListingPage.tsx
@@ -33,7 +33,6 @@ const { title: whiteLabelTitle, footerOptions: whiteLabelFooterOpts } =
 export const ServiceListingPage = () => {
   const { id } = useParams<{ id: string }>();
   const [service, setService] = useState<Service | null>(null);
-  const [feedbackModalOpen, setFeedbackModalOpen] = useState(false);
   const details = useMemo(
     () => (service ? generateServiceDetails(service) : []),
     [service]
@@ -65,9 +64,6 @@ export const ServiceListingPage = () => {
   );
   const onClickAction = (action: OrganizationAction) => {
     switch (action.icon) {
-      case "feedback":
-        setFeedbackModalOpen(true);
-        break;
       case "print":
         window.print();
         break;

From df604559b07206f4fb4fb073ebd97c97c32f7388 Mon Sep 17 00:00:00 2001
From: Vainakh <adlanyandarbiev@gmail.com>
Date: Tue, 14 May 2024 12:31:55 -0600
Subject: [PATCH 8/8] #1267 Remove all references of string feedback in
 OrganizationListingPage.tsx abd ServiceListingPage.tsx. Remove feedback form
 related classnames from ActionBar.scss.

---
 app/components/listing/ActionBar.scss | 33 ---------------------------
 app/pages/OrganizationListingPage.tsx |  4 ++--
 app/pages/ServiceListingPage.tsx      |  4 ++--
 3 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/app/components/listing/ActionBar.scss b/app/components/listing/ActionBar.scss
index 0ee2f7809..bcee2989f 100644
--- a/app/components/listing/ActionBar.scss
+++ b/app/components/listing/ActionBar.scss
@@ -37,39 +37,6 @@
   }
 }
 
-.feedback__Overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(94, 94, 94, 0.6);
-  overflow: auto;
-}
-
-.feedback__Modal {
-  position: absolute;
-  margin: 0 auto;
-  top: 20%;
-  left: 0;
-  right: 0;
-  width: 570px;
-  padding: 34px 46px;
-  background-color: $color-white;
-  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.25);
-  border-radius: 10px;
-  @media screen and (max-width: 767px) {
-    top: 5%;
-    width: 100%;
-    height: 95%;
-    padding: 40px 25px;
-  }
-}
-
-.feedback-modal {
-  display: none;
-}
-
 .mobile-action-bar {
   display: none;
   @include r_max($break-tablet-s) {
diff --git a/app/pages/OrganizationListingPage.tsx b/app/pages/OrganizationListingPage.tsx
index bb8267dd0..26ddc495e 100644
--- a/app/pages/OrganizationListingPage.tsx
+++ b/app/pages/OrganizationListingPage.tsx
@@ -51,10 +51,10 @@ export const OrganizationListingPage = () => {
   const orgLocations = getOrganizationLocations(org);
   const allActions = getOrganizationActions(org);
   const sidebarActions = allActions.filter((a) =>
-    ["print", "directions", "feedback"].includes(a.icon)
+    ["print", "directions"].includes(a.icon)
   );
   const mobileActions = allActions.filter((a) =>
-    ["phone", "directions", "feedback"].includes(a.icon)
+    ["phone", "directions"].includes(a.icon)
   );
   const onClickAction = (action: OrganizationAction) => {
     switch (action.icon) {
diff --git a/app/pages/ServiceListingPage.tsx b/app/pages/ServiceListingPage.tsx
index 5b8f58a3a..176127b12 100644
--- a/app/pages/ServiceListingPage.tsx
+++ b/app/pages/ServiceListingPage.tsx
@@ -57,10 +57,10 @@ export const ServiceListingPage = () => {
   const locations = getServiceLocations(service, resource, recurringSchedule);
   const allActions = getOrganizationActions(resource);
   const sidebarActions = allActions.filter((a) =>
-    ["print", "directions", "feedback"].includes(a.icon)
+    ["print", "directions"].includes(a.icon)
   );
   const mobileActions = allActions.filter((a) =>
-    ["phone", "directions", "feedback"].includes(a.icon)
+    ["phone", "directions"].includes(a.icon)
   );
   const onClickAction = (action: OrganizationAction) => {
     switch (action.icon) {