From e99396a50b3544935d366c26ec5d7ad531e6e95e Mon Sep 17 00:00:00 2001
From: Ashley <ashleyrawr74@gmail.com>
Date: Sat, 14 Aug 2021 12:34:35 -0700
Subject: [PATCH 1/6] Added loading screen placeholder while sign out is in
 progress

---
 src/components/BookAChat/index.tsx   | 24 ++++++++++++------------
 src/layouts/AuthorizationWrapper.tsx |  7 +++++++
 src/layouts/TabLayout/TabLayout.tsx  |  7 ++++++-
 src/utils/firebase/auth.tsx          |  2 ++
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/components/BookAChat/index.tsx b/src/components/BookAChat/index.tsx
index eb1a0a44..2e173676 100644
--- a/src/components/BookAChat/index.tsx
+++ b/src/components/BookAChat/index.tsx
@@ -208,19 +208,19 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
 
   return (
     <div>
-      <div className="h-4"></div>
+      <div className="h-4" />
       <Text h2>
         Book a chat with{" "}
         <b>
           {mentor.user.firstName} {mentor.user.lastName}
         </b>
       </Text>
-      <div className="h-2"></div>
+      <div className="h-2" />
       <Text className="text-secondary">
         If no times are open, the mentor is either completely booked or has not
         set availabilities yet.
       </Text>
-      <div className="h-8"></div>
+      <div className="h-8" />
 
       <div className="flex">
         <Card className="p-12">
@@ -254,14 +254,14 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
           />
         </Card>
 
-        <div className="w-8"></div>
+        <div className="w-8" />
         <Card className="p-12 w-80">
           <div>
             <Text b1 b>
               Available Times
             </Text>
           </div>
-          <div className="h-2"></div>
+          <div className="h-2" />
           <div>
             <Text b className="text-secondary">
               {selectedDate
@@ -270,7 +270,7 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
             </Text>
           </div>
 
-          <div className="h-4"></div>
+          <div className="h-4" />
           <div className="h-80 box-border flex flex-col gap-2 overflow-y-auto">
             {timeslots.map((timeslot) => {
               return (
@@ -305,7 +305,7 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
               </Text>
             </Text>
           </div>
-          <div className="h-2"></div>
+          <div className="h-2" />
           <div>
             <Text b>Date:</Text>{" "}
             <Text>
@@ -319,7 +319,7 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
               {dateFormat(selectedTimeslot?.endTime, "h:MMtt")}
             </Text>
           </div>
-          <div className="h-6"></div>
+          <div className="h-6" />
 
           <TextArea
             value={chatRequestMessage}
@@ -328,9 +328,9 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
               setChatRequestMessage(target.value);
             }}
             className="p-2 w-96"
-            placeholder="Optional message"
-          ></TextArea>
-          <div className="h-8"></div>
+            placeholder="Optional message (i.e. preferred location)"
+          />
+          <div className="h-8" />
 
           <div className="flex">
             <Button
@@ -342,7 +342,7 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
             >
               Cancel
             </Button>
-            <div className="w-2"></div>
+            <div className="w-2" />
             <Button
               size="small"
               onClick={() => {
diff --git a/src/layouts/AuthorizationWrapper.tsx b/src/layouts/AuthorizationWrapper.tsx
index bfe4bd5e..5ca979ae 100644
--- a/src/layouts/AuthorizationWrapper.tsx
+++ b/src/layouts/AuthorizationWrapper.tsx
@@ -3,6 +3,7 @@ import React, { Fragment } from "react";
 import ErrorScreen, { ErrorScreenType } from "../components/ErrorScreen";
 import { AuthorizationLevel, useAuthorizationLevel } from "../hooks";
 import AuthenticationModal from "../components/Authentication/AuthenticationModal";
+import { useAuth } from "../utils/firebase/auth";
 
 interface AuthorizationWrapperProps {
   canView?: AuthorizationLevel[];
@@ -12,9 +13,15 @@ const AuthorizationWrapper: React.FC<AuthorizationWrapperProps> = ({
   children,
   canView,
 }) => {
+  const { loading } = useAuth();
   const router = useRouter();
   const authorizationLevel = useAuthorizationLevel();
 
+  if (loading) {
+    console.log("loading");
+    return <>Loading Screen</>;
+  }
+
   if (authorizationLevel === AuthorizationLevel.WaitingForUserData)
     return <Fragment />;
 
diff --git a/src/layouts/TabLayout/TabLayout.tsx b/src/layouts/TabLayout/TabLayout.tsx
index fa3b4a60..4f443d5b 100644
--- a/src/layouts/TabLayout/TabLayout.tsx
+++ b/src/layouts/TabLayout/TabLayout.tsx
@@ -4,6 +4,7 @@ import { useRouter } from "next/router";
 import React, { ReactNode, useEffect, useState } from "react";
 import { Text } from "../../components/atomic";
 import TabFooterMenu from "../../components/TabFooterMenu";
+import { useAuth } from "../../utils/firebase/auth";
 import LocalStorage from "../../utils/localstorage";
 import ProgramDropdown from "./ProgramDropdown";
 
@@ -76,12 +77,16 @@ const TabLayout: React.FC<TabLayoutProps> & {
     Icon: React.FC<React.SVGProps<SVGSVGElement>>;
   }>;
 } = ({ children, currentPageChildren }) => {
+  const { loading } = useAuth();
+
   return (
     <div className="flex h-screen w-screen">
       <div className="flex flex-col h-screen w-72 flex-shrink-0 bg-white shadow-lg relative">
         <ProgramDropdown />
         <div className="h-0.25 w-full bg-tertiary flex-shrink-0"></div>
-        <div className="overflow-y-auto h-full">{children}</div>
+        <div className="overflow-y-auto h-full">
+          {loading ? <>Loading Screen</> : children}
+        </div>
         <TabFooterMenu />
       </div>
       <div className="flex-grow overflow-x-hidden">{currentPageChildren}</div>
diff --git a/src/utils/firebase/auth.tsx b/src/utils/firebase/auth.tsx
index 2fe0e12e..b0195835 100644
--- a/src/utils/firebase/auth.tsx
+++ b/src/utils/firebase/auth.tsx
@@ -75,8 +75,10 @@ function useProvideAuth() {
       .auth()
       .signOut()
       .then(() => {
+        setLoading(true);
         clearCache();
         setUser(null);
+        setLoading(false);
       });
   };
 

From bf0700cfbfb263e411d820473f3f030081b1698f Mon Sep 17 00:00:00 2001
From: Ashley <ashleyrawr74@gmail.com>
Date: Mon, 23 Aug 2021 12:16:33 -0700
Subject: [PATCH 2/6] Added setting of preferred location in my/profile Added
 mentee ability to set preferred location when booking Attempted to fix flash
 of page when logging out, failed

---
 src/components/BookAChat/index.tsx            | 17 +++++-
 .../ReviewChats/ChatRequestFilterer.tsx       |  1 +
 src/graphql/queries/getMyUser.graphql         |  2 +
 .../TabLayout/NoMatchingProfileTabLayout.tsx  |  3 +-
 src/pages/index.tsx                           | 57 +++++++++----------
 src/pages/my/profile.tsx                      | 33 ++++++++++-
 .../program/[slug]/[profileRoute]/index.tsx   |  6 +-
 src/utils/firebase/auth.tsx                   |  5 +-
 8 files changed, 87 insertions(+), 37 deletions(-)

diff --git a/src/components/BookAChat/index.tsx b/src/components/BookAChat/index.tsx
index 2e173676..1e6cf76c 100644
--- a/src/components/BookAChat/index.tsx
+++ b/src/components/BookAChat/index.tsx
@@ -17,6 +17,7 @@ import { Button, Card, Modal, Text, TextArea } from "../atomic";
 import Calendar from "../Calendar";
 import { getDatesInThisMonth } from "../Calendar/utils";
 import OneOptionModal from "../OneOptionModal";
+import TitledInput from "../TitledInput";
 import { mergeIntervalLists } from "./utils";
 
 type MentorProfile = GetProfilesQuery["getProfiles"][number];
@@ -112,6 +113,7 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
   const [loadingCreateChatRequest, setLoadingCreateChatRequest] =
     useState(false);
   const [chatRequestMessage, setChatRequestMessage] = useState("");
+  const [preferredLocation, setPreferredLocation] = useState("");
 
   loadingCreateChatRequest; // TODO: Use this variable
 
@@ -320,7 +322,17 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
             </Text>
           </div>
           <div className="h-6" />
-
+          <TitledInput
+            title="Preferred meeting location"
+            placeholder="Favorite coffee shop address, zoom link, or other"
+            className="w-full"
+            value={preferredLocation}
+            onChange={(e) => setPreferredLocation(e.target.value)}
+          />
+          <div className="h-6" />
+          <Text b className="w-full">
+            Optional Message
+          </Text>
           <TextArea
             value={chatRequestMessage}
             onChange={(e: any) => {
@@ -328,7 +340,7 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
               setChatRequestMessage(target.value);
             }}
             className="p-2 w-96"
-            placeholder="Optional message (i.e. preferred location)"
+            placeholder="Hi! My name is John Doe, and I'd love to talk to you about your experience at the circus!"
           />
           <div className="h-8" />
 
@@ -351,6 +363,7 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
                 const createChatRequestInput: CreateChatRequestInput = {
                   mentorProfileId: mentor.profileId,
                   chatRequestMessage: chatRequestMessage,
+                  location: preferredLocation,
                   chatStartTime: toUTC(selectedTimeslot.startTime).getTime(),
                   chatEndTime: toUTC(selectedTimeslot.endTime).getTime(),
                 };
diff --git a/src/components/ReviewChats/ChatRequestFilterer.tsx b/src/components/ReviewChats/ChatRequestFilterer.tsx
index b08d7ec9..3bce954b 100644
--- a/src/components/ReviewChats/ChatRequestFilterer.tsx
+++ b/src/components/ReviewChats/ChatRequestFilterer.tsx
@@ -138,6 +138,7 @@ const ChatRequestListItem = ({
             className="hover:bg-inactive p-1 rounded"
             title="Accept Chat Request"
             onClick={() => {
+              
               acceptChatRequestMutation().then(() => {
                 onChatRequestAccept(
                   chatRequest.menteeProfile.user.firstName +
diff --git a/src/graphql/queries/getMyUser.graphql b/src/graphql/queries/getMyUser.graphql
index 763f1709..958e0e81 100644
--- a/src/graphql/queries/getMyUser.graphql
+++ b/src/graphql/queries/getMyUser.graphql
@@ -4,6 +4,8 @@ query getMyUser {
     email
     firstName
     lastName
+    defaultLocation
+    videoChatLink
     profilePictureUrl
     timezone
     profiles {
diff --git a/src/layouts/TabLayout/NoMatchingProfileTabLayout.tsx b/src/layouts/TabLayout/NoMatchingProfileTabLayout.tsx
index 8c1d18ee..1db0574f 100644
--- a/src/layouts/TabLayout/NoMatchingProfileTabLayout.tsx
+++ b/src/layouts/TabLayout/NoMatchingProfileTabLayout.tsx
@@ -11,7 +11,7 @@ import TabLayout, { BaseTabLayoutProps } from "./TabLayout";
 const NoMatchingProfileLayout: React.FC<BaseTabLayoutProps> = ({
   children,
 }) => {
-  const { user } = useAuth();
+  const { user, setLoading } = useAuth();
   const router = useRouter();
 
   if (user == null) {
@@ -33,6 +33,7 @@ const NoMatchingProfileLayout: React.FC<BaseTabLayoutProps> = ({
         className={pageItemStyles}
         onClick={() => {
           LocalStorage.delete("cachedProfileSlug");
+          setLoading(true);
           router.push("/");
         }}
       >
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 4b640ceb..d4fe736a 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -14,6 +14,7 @@ import {
 } from "../generated/graphql";
 import { PageGetProgramBySlugComp } from "../generated/page";
 import { AuthorizationLevel, useAuthorizationLevel } from "../hooks";
+import AuthorizationWrapper from "../layouts/AuthorizationWrapper";
 import NoProgramTabLayout from "../layouts/TabLayout/NoProgramTabLayout";
 import Page from "../types/Page";
 import { MAP_PROFILETYPE_TO_ROUTE } from "../utils/constants";
@@ -34,7 +35,9 @@ const BlobCircle = () => {
 const IndexPage: PageGetProgramBySlugComp = (_) => {
   const router = useRouter();
   const authorizationLevel = useAuthorizationLevel();
-  const { user } = useAuth();
+  const { user, setLoading } = useAuth();
+  //This is so that universally (wherever you log out from), you'll stop the loading screen here
+  setLoading(false);
 
   if (authorizationLevel === AuthorizationLevel.Unauthenticated) {
     if (user)
@@ -183,36 +186,32 @@ type ProgramRowProps = {
   profileType: ProfileType;
 };
 
-const ProgramRow = ({ iconUrl, name, route, profileType }: ProgramRowProps) => {
-  return (
-    <div className="flex items-center justify-between">
-      <div className="flex gap-4 items-center">
-        <img
-          src={iconUrl}
-          alt={`Program ${name} icon`}
-          className="h-10 w-10 col-span-1"
-        />
-        <div className="flex flex-col">
-          <Text>{name}</Text>
-          <Text className="text-secondary text-caption">
-            {MAP_PROFILETYPE_TO_NAME[profileType]}
-          </Text>
-        </div>
+const ProgramRow = ({ iconUrl, name, route, profileType }: ProgramRowProps) => (
+  <div className="flex items-center justify-between">
+    <div className="flex gap-4 items-center">
+      <img
+        src={iconUrl}
+        alt={`Program ${name} icon`}
+        className="h-10 w-10 col-span-1"
+      />
+      <div className="flex flex-col">
+        <Text>{name}</Text>
+        <Text className="text-secondary text-caption">
+          {MAP_PROFILETYPE_TO_NAME[profileType]}
+        </Text>
       </div>
-      <Text
-        u
-        b
-        className="text-secondary hover:cursor-pointer hover:text-primary"
-      >
-        <Link
-          href={`/program/${route}/${MAP_PROFILETYPE_TO_ROUTE[profileType]}`}
-        >
-          Go to Homepage
-        </Link>
-      </Text>
     </div>
-  );
-};
+    <Text
+      u
+      b
+      className="text-secondary hover:cursor-pointer hover:text-primary"
+    >
+      <Link href={`/program/${route}/${MAP_PROFILETYPE_TO_ROUTE[profileType]}`}>
+        Go to Homepage
+      </Link>
+    </Text>
+  </div>
+);
 
 interface ApplicationRowProps {
   application: GetMyUserApplicationsQuery["getMyUser"]["applications"][number];
diff --git a/src/pages/my/profile.tsx b/src/pages/my/profile.tsx
index 73a503d8..d47416e1 100644
--- a/src/pages/my/profile.tsx
+++ b/src/pages/my/profile.tsx
@@ -24,6 +24,10 @@ const GeneralProfile: Page = () => {
   const [modified, setModified] = useState(false);
   const [firstName, setFirstName] = useState(data?.getMyUser.firstName);
   const [lastName, setLastName] = useState(data?.getMyUser.lastName);
+  const [location, setLocation] = useState(data?.getMyUser.defaultLocation);
+  const [videoChatLink, setVideoChatLink] = useState(
+    data?.getMyUser.videoChatLink
+  );
   const { setSnackbarMessage } = useSnackbar();
 
   const [profilePicture, setProfilePicture] = useState<File | null>();
@@ -81,6 +85,8 @@ const GeneralProfile: Page = () => {
                     firstName: firstName,
                     lastName: lastName,
                     profilePictureUrl: url,
+                    defaultLocation: location,
+                    videoChatLink: videoChatLink,
                   },
                 },
               });
@@ -93,7 +99,9 @@ const GeneralProfile: Page = () => {
         </div>
         <div className="h-4" />
         {data?.getMyUser ? (
-          <Card className="p-10 space-y-4 col-span-7">
+          <Card className="p-10 space-y-4 col-span-9">
+            <Text className="text-error">{error}</Text>
+            <div />
             <Text h3 b>
               Profile Picture
             </Text>
@@ -129,7 +137,28 @@ const GeneralProfile: Page = () => {
                 }}
               />
             </div>
-            <Text className="text-error">{error}</Text>
+            <div className="h-4" />
+            <Text h3 b>
+              Default Locations
+            </Text>
+            <TitledInput
+              title="Default Location for In-Person Chats"
+              placeholder="Office address, favorite coffee shop, etc."
+              value={location}
+              onChange={(e) => {
+                setModified(true);
+                setLocation(e.target.value);
+              }}
+            />
+            <TitledInput
+              title="Default Link for Online Chats"
+              placeholder="Permanent Zoom link, Google Meets link, etc."
+              value={videoChatLink}
+              onChange={(e) => {
+                setModified(true);
+                setVideoChatLink(e.target.value);
+              }}
+            />
           </Card>
         ) : (
           <div>Loading</div>
diff --git a/src/pages/program/[slug]/[profileRoute]/index.tsx b/src/pages/program/[slug]/[profileRoute]/index.tsx
index 21579d0f..336cd3b0 100644
--- a/src/pages/program/[slug]/[profileRoute]/index.tsx
+++ b/src/pages/program/[slug]/[profileRoute]/index.tsx
@@ -2,7 +2,7 @@ import { RawDraftContentState } from "draft-js";
 import type { GetServerSideProps } from "next";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import React, { HTMLAttributes } from "react";
+import React, { Fragment, HTMLAttributes } from "react";
 import { Button, Card, Text } from "../../../../components/atomic";
 import ErrorScreen, {
   ErrorScreenType,
@@ -27,6 +27,7 @@ import { useSnackbar } from "../../../../notifications/SnackbarContext";
 import Page from "../../../../types/Page";
 import { parseParam } from "../../../../utils";
 import { MAP_PROFILETYPE_TO_ROUTE } from "../../../../utils/constants";
+import { useAuth } from "../../../../utils/firebase/auth";
 import LocalStorage from "../../../../utils/localstorage";
 
 function getRawContentState(json: string): RawDraftContentState {
@@ -189,10 +190,13 @@ const ReadOnlyHome = ({
 
 //TODO: Change type of this to not any
 const ProgramPage: PageGetProgramBySlugComp & Page = (props: any) => {
+  const { loading } = useAuth();
   const authorizationLevel = useAuthorizationLevel();
 
   const program = props.data?.getProgramBySlug;
 
+  if (loading) return <Fragment />;
+
   if (!program) {
     return <ErrorScreen type={ErrorScreenType.PageNotFound} />;
   }
diff --git a/src/utils/firebase/auth.tsx b/src/utils/firebase/auth.tsx
index b0195835..36981476 100644
--- a/src/utils/firebase/auth.tsx
+++ b/src/utils/firebase/auth.tsx
@@ -5,6 +5,7 @@ import firebase from "./firebase";
 interface AuthContext {
   user: firebase.User | null;
   loading: boolean;
+  setLoading: (b: boolean) => void;
   //TODO: customize the forget password flow instead of directly through firebase's ugly ui
   // confirmPasswordReset: (c: string, n: string) => Promise<void>;
   sendPasswordResetEmail: (e: string) => Promise<void>;
@@ -76,9 +77,8 @@ function useProvideAuth() {
       .signOut()
       .then(() => {
         setLoading(true);
-        clearCache();
         setUser(null);
-        setLoading(false);
+        clearCache();
       });
   };
 
@@ -95,6 +95,7 @@ function useProvideAuth() {
   return {
     user,
     loading,
+    setLoading,
     // confirmPasswordReset,
     sendPasswordResetEmail,
     signUpWithEmail,

From 96f2757ab2d77c32eacb22b773ba9d8dcde6eb01 Mon Sep 17 00:00:00 2001
From: Ashley <ashleyrawr74@gmail.com>
Date: Mon, 23 Aug 2021 13:41:56 -0700
Subject: [PATCH 3/6] Allow mentors and mentees to set default locations and
 coordinate location before confirming a chat

---
 src/components/BookAChat/index.tsx            |  31 +++--
 src/components/ProfileModal.tsx               |   8 +-
 .../ReviewChats/ChatRequestFilterer.tsx       | 108 +++++++++++++-----
 .../chatRequests/acceptChatRequest.graphql    |   4 +-
 src/graphql/queries/getChatRequests.graphql   |   2 +
 src/graphql/queries/getMyUser.graphql         |   1 -
 src/graphql/queries/getProfiles.graphql       |   1 +
 src/pages/index.tsx                           |   1 -
 src/pages/my/profile.tsx                      |  23 +---
 9 files changed, 116 insertions(+), 63 deletions(-)

diff --git a/src/components/BookAChat/index.tsx b/src/components/BookAChat/index.tsx
index 1e6cf76c..09ea69f2 100644
--- a/src/components/BookAChat/index.tsx
+++ b/src/components/BookAChat/index.tsx
@@ -11,13 +11,13 @@ import {
   useGetAvailOverrideDatesQuery,
   useGetAvailWeeklysQuery,
   useGetChatRequestsQuery,
+  useGetMyUserQuery,
 } from "../../generated/graphql";
 import useTimezoneConverters from "../../hooks/useTimezoneConverters";
-import { Button, Card, Modal, Text, TextArea } from "../atomic";
+import { Button, Card, Input, Modal, Text, TextArea } from "../atomic";
 import Calendar from "../Calendar";
 import { getDatesInThisMonth } from "../Calendar/utils";
 import OneOptionModal from "../OneOptionModal";
-import TitledInput from "../TitledInput";
 import { mergeIntervalLists } from "./utils";
 
 type MentorProfile = GetProfilesQuery["getProfiles"][number];
@@ -102,6 +102,7 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
     useGetChatRequestsQuery({
       variables: { profileId: mentor.profileId },
     });
+  const { data: user } = useGetMyUserQuery();
 
   const [createChatRequest] = useCreateChatRequestMutation({
     refetchQueries: [
@@ -113,7 +114,9 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
   const [loadingCreateChatRequest, setLoadingCreateChatRequest] =
     useState(false);
   const [chatRequestMessage, setChatRequestMessage] = useState("");
-  const [preferredLocation, setPreferredLocation] = useState("");
+  const [preferredLocation, setPreferredLocation] = useState(
+    user?.getMyUser.defaultLocation
+  );
 
   loadingCreateChatRequest; // TODO: Use this variable
 
@@ -298,7 +301,7 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
           setSendChatModalOpen(false);
         }}
       >
-        <div className="p-4 flex flex-col items-center">
+        <div className="p-4 flex flex-col items-center w-144">
           <div>
             <Text>
               Send Chat Request to{" "}
@@ -322,8 +325,16 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
             </Text>
           </div>
           <div className="h-6" />
-          <TitledInput
-            title="Preferred meeting location"
+          <Text b className="w-full">
+            Preferred meeting location:
+          </Text>
+          <Text i secondary>
+            You can set your default preferred location in Profile {">"} My
+            General Profile. Keep in mind that the mentor has the final say on
+            location!
+          </Text>
+          <div className="h-2" />
+          <Input
             placeholder="Favorite coffee shop address, zoom link, or other"
             className="w-full"
             value={preferredLocation}
@@ -333,18 +344,19 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
           <Text b className="w-full">
             Optional Message
           </Text>
+          <div className="h-2" />
           <TextArea
             value={chatRequestMessage}
             onChange={(e: any) => {
               const target = e.target as HTMLTextAreaElement;
               setChatRequestMessage(target.value);
             }}
-            className="p-2 w-96"
+            className="p-2 w-full"
             placeholder="Hi! My name is John Doe, and I'd love to talk to you about your experience at the circus!"
           />
           <div className="h-8" />
 
-          <div className="flex">
+          <div className="w-full flex justify-between">
             <Button
               variant="inverted"
               size="small"
@@ -354,7 +366,6 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
             >
               Cancel
             </Button>
-            <div className="w-2" />
             <Button
               size="small"
               onClick={() => {
@@ -363,7 +374,7 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
                 const createChatRequestInput: CreateChatRequestInput = {
                   mentorProfileId: mentor.profileId,
                   chatRequestMessage: chatRequestMessage,
-                  location: preferredLocation,
+                  location: preferredLocation || "",
                   chatStartTime: toUTC(selectedTimeslot.startTime).getTime(),
                   chatEndTime: toUTC(selectedTimeslot.endTime).getTime(),
                 };
diff --git a/src/components/ProfileModal.tsx b/src/components/ProfileModal.tsx
index 5bf44c79..54214089 100644
--- a/src/components/ProfileModal.tsx
+++ b/src/components/ProfileModal.tsx
@@ -75,7 +75,7 @@ const ProfileModal = ({
               <div>
                 <div>
                   <div className="rounded bg-tertiary p-4">
-                    <table className="table-auto">
+                    <table className="table-auto w-96">
                       <tr>
                         <td>
                           <Text b>Email:</Text>
@@ -84,6 +84,12 @@ const ProfileModal = ({
                           <Text>{profile.user.email}</Text>
                         </td>
                       </tr>
+                      <tr>
+                        <td>
+                          <Text b>Preferred Location:</Text>
+                        </td>
+                        <td className="pl-4">{profile.user.defaultLocation}</td>
+                      </tr>
                     </table>
                   </div>
                 </div>
diff --git a/src/components/ReviewChats/ChatRequestFilterer.tsx b/src/components/ReviewChats/ChatRequestFilterer.tsx
index 3bce954b..31b50643 100644
--- a/src/components/ReviewChats/ChatRequestFilterer.tsx
+++ b/src/components/ReviewChats/ChatRequestFilterer.tsx
@@ -16,6 +16,7 @@ import InlineProfileAvatar from "../InlineProfileAvatar";
 import ListFilterer from "../ListFilterer";
 import OneOptionModal from "../OneOptionModal";
 import ProfileModal from "../ProfileModal";
+import TitledInput from "../TitledInput";
 import ModifyChatRequestModal from "./ChatRequestMutators";
 
 type ChatRequestPartial = Omit<
@@ -108,12 +109,17 @@ const ChatRequestListItem = ({
   chatRequest,
   onChatRequestAccept,
 }: ChatRequestListItemProps) => {
-  const [isRejectModalOpen, setIsRejectModalOpen] = useState(false);
+  const [isRejectModalOpen, setRejectModalOpen] = useState(false);
   const [rejectMessage, setRejectMessage] = useState("");
 
+  const [isSetLocationModalOpen, setSetLocationModalOpen] = useState(false);
+  const [location, setLocation] = useState(
+    chatRequest.mentorProfile.user.defaultLocation
+  );
   const [acceptChatRequestMutation] = useAcceptChatRequestMutation({
     variables: {
       chatRequestId: chatRequest.chatRequestId,
+      location: location,
     },
     refetchQueries: [
       refetchGetChatRequestsQuery({
@@ -138,14 +144,7 @@ const ChatRequestListItem = ({
             className="hover:bg-inactive p-1 rounded"
             title="Accept Chat Request"
             onClick={() => {
-              
-              acceptChatRequestMutation().then(() => {
-                onChatRequestAccept(
-                  chatRequest.menteeProfile.user.firstName +
-                    " " +
-                    chatRequest.menteeProfile.user.lastName
-                );
-              });
+              setSetLocationModalOpen(true);
             }}
           >
             <CircledCheck className="h-8 w-8" />
@@ -154,7 +153,7 @@ const ChatRequestListItem = ({
             className="hover:bg-inactive p-1 rounded"
             title="Reject Chat Request"
             onClick={() => {
-              setIsRejectModalOpen(true);
+              setRejectModalOpen(true);
             }}
           >
             <CircledCross className="h-8 w-8" />
@@ -187,20 +186,70 @@ const ChatRequestListItem = ({
         <div className="md:w-8 lg:w-12" />
       </div>
       <Modal
-        isOpen={isRejectModalOpen}
+        isOpen={isSetLocationModalOpen}
         onClose={() => {
-          setIsRejectModalOpen(false);
+          setSetLocationModalOpen(false);
         }}
       >
-        <div className="p-4 flex flex-col items-center">
-          <div>
-            <Text>
-              Let {chatRequest.menteeProfile.user.firstName} know why you are
-              rejecting the request:
-            </Text>
+        <div className="p-4 flex flex-col space-y-6">
+          <Text h3 b>
+            Accept Chat Request
+          </Text>
+          <Text>
+            {chatRequest.menteeProfile.user.firstName} has specified that they
+            prefer to meet here:
+            <br className="h-2" />
+            <Text i>{chatRequest.location}</Text>
+          </Text>
+          <TitledInput
+            title="Confirm the location:"
+            className="w-144"
+            placeholder="Set your default location in Profile Picture > My General Profile"
+            value={location}
+            onChange={(e) => setLocation(e.target.value)}
+          />
+          <div className="w-full flex justify-between">
+            <Button
+              size="small"
+              variant="inverted"
+              onClick={() => setSetLocationModalOpen(false)}
+            >
+              Cancel
+            </Button>
+            <Button
+              size="small"
+              onClick={() => {
+                acceptChatRequestMutation().then(() => {
+                  onChatRequestAccept(
+                    chatRequest.menteeProfile.user.firstName +
+                      " " +
+                      chatRequest.menteeProfile.user.lastName
+                  );
+                });
+                setSetLocationModalOpen(false);
+              }}
+            >
+              Confirm
+            </Button>
           </div>
-          <div className="h-6"></div>
-
+        </div>
+      </Modal>
+      <Modal
+        isOpen={isRejectModalOpen}
+        onClose={() => {
+          setRejectModalOpen(false);
+        }}
+      >
+        <div className="p-4 flex flex-col">
+          <Text h3 b>
+            Reject Chat Request
+          </Text>
+          <div className="h-6" />
+          <Text>
+            Let {chatRequest.menteeProfile.user.firstName} know why you are
+            rejecting the request:
+          </Text>
+          <div className="h-6" />
           <TextArea
             value={rejectMessage}
             onChange={(e: any) => {
@@ -209,20 +258,19 @@ const ChatRequestListItem = ({
             }}
             className="w-96"
             placeholder="Reason for rejection"
-          ></TextArea>
-          <div className="h-8"></div>
+          />
+          <div className="h-8" />
 
-          <div className="flex">
+          <div className="flex justify-between">
             <Button
               variant="inverted"
               size="small"
               onClick={() => {
-                setIsRejectModalOpen(false);
+                setRejectModalOpen(false);
               }}
             >
               Cancel
             </Button>
-            <div className="w-2"></div>
             <Button
               size="small"
               onClick={() => {
@@ -232,7 +280,7 @@ const ChatRequestListItem = ({
                     chatRejectMessage: rejectMessage,
                   },
                 });
-                setIsRejectModalOpen(false);
+                setRejectModalOpen(false);
               }}
             >
               Reject
@@ -257,15 +305,17 @@ const ChatRequestsList = ({ title, chatRequests }: ChatRequestsListProps) => {
     <Fragment>
       <div className="flex flex-col px-8 py-6">
         <Text h3>{title}</Text>
-        <div className="h-4"></div>
+        <div className="h-4" />
         {chatRequests.length > 0 ? (
           chatRequests.map((cr) => (
             <ChatRequestListItem
               key={cr.chatRequestId}
               chatRequest={cr}
               onChatRequestAccept={(mentee: string) => {
-                setIsAcceptModalOpen(true);
-                setMentee(mentee);
+                setTimeout(() => {
+                  setIsAcceptModalOpen(true);
+                  setMentee(mentee);
+                }, 250);
               }}
             />
           ))
diff --git a/src/graphql/mutations/chatRequests/acceptChatRequest.graphql b/src/graphql/mutations/chatRequests/acceptChatRequest.graphql
index d0042bd9..a38c4474 100644
--- a/src/graphql/mutations/chatRequests/acceptChatRequest.graphql
+++ b/src/graphql/mutations/chatRequests/acceptChatRequest.graphql
@@ -1,5 +1,5 @@
-mutation acceptChatRequest($chatRequestId: String!) {
-  acceptChatRequest(chatRequestId: $chatRequestId) {
+mutation acceptChatRequest($chatRequestId: String!, $location: String!) {
+  acceptChatRequest(chatRequestId: $chatRequestId, location: $location) {
     chatRequestId
   }
 }
diff --git a/src/graphql/queries/getChatRequests.graphql b/src/graphql/queries/getChatRequests.graphql
index e91dade7..960ab868 100644
--- a/src/graphql/queries/getChatRequests.graphql
+++ b/src/graphql/queries/getChatRequests.graphql
@@ -6,6 +6,7 @@ query getChatRequests($profileId: String!) {
     chatEndTime
     chatRequestMessage
     chatRejectMessage
+    location
     mentorProfileId
     mentorProfile {
       profileJson
@@ -13,6 +14,7 @@ query getChatRequests($profileId: String!) {
       bio
       user {
         email
+        defaultLocation
         firstName
         lastName
         profilePictureUrl
diff --git a/src/graphql/queries/getMyUser.graphql b/src/graphql/queries/getMyUser.graphql
index 958e0e81..7302450e 100644
--- a/src/graphql/queries/getMyUser.graphql
+++ b/src/graphql/queries/getMyUser.graphql
@@ -5,7 +5,6 @@ query getMyUser {
     firstName
     lastName
     defaultLocation
-    videoChatLink
     profilePictureUrl
     timezone
     profiles {
diff --git a/src/graphql/queries/getProfiles.graphql b/src/graphql/queries/getProfiles.graphql
index 909d782e..9034f5c0 100644
--- a/src/graphql/queries/getProfiles.graphql
+++ b/src/graphql/queries/getProfiles.graphql
@@ -8,6 +8,7 @@ query getProfiles($programId: String!, $profileType: String!) {
     user {
       userId
       email
+      defaultLocation
       firstName
       lastName
       profilePictureUrl
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index d4fe736a..254e66cc 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -14,7 +14,6 @@ import {
 } from "../generated/graphql";
 import { PageGetProgramBySlugComp } from "../generated/page";
 import { AuthorizationLevel, useAuthorizationLevel } from "../hooks";
-import AuthorizationWrapper from "../layouts/AuthorizationWrapper";
 import NoProgramTabLayout from "../layouts/TabLayout/NoProgramTabLayout";
 import Page from "../types/Page";
 import { MAP_PROFILETYPE_TO_ROUTE } from "../utils/constants";
diff --git a/src/pages/my/profile.tsx b/src/pages/my/profile.tsx
index d47416e1..64474774 100644
--- a/src/pages/my/profile.tsx
+++ b/src/pages/my/profile.tsx
@@ -25,9 +25,6 @@ const GeneralProfile: Page = () => {
   const [firstName, setFirstName] = useState(data?.getMyUser.firstName);
   const [lastName, setLastName] = useState(data?.getMyUser.lastName);
   const [location, setLocation] = useState(data?.getMyUser.defaultLocation);
-  const [videoChatLink, setVideoChatLink] = useState(
-    data?.getMyUser.videoChatLink
-  );
   const { setSnackbarMessage } = useSnackbar();
 
   const [profilePicture, setProfilePicture] = useState<File | null>();
@@ -42,6 +39,7 @@ const GeneralProfile: Page = () => {
       setFirstName(data.getMyUser.firstName);
       setLastName(data.getMyUser.lastName);
       setSrc(data.getMyUser.profilePictureUrl);
+      setLocation(data.getMyUser.defaultLocation);
       setProfilePicture(null);
       setError(null);
     }
@@ -86,7 +84,6 @@ const GeneralProfile: Page = () => {
                     lastName: lastName,
                     profilePictureUrl: url,
                     defaultLocation: location,
-                    videoChatLink: videoChatLink,
                   },
                 },
               });
@@ -137,28 +134,16 @@ const GeneralProfile: Page = () => {
                 }}
               />
             </div>
-            <div className="h-4" />
-            <Text h3 b>
-              Default Locations
-            </Text>
             <TitledInput
-              title="Default Location for In-Person Chats"
-              placeholder="Office address, favorite coffee shop, etc."
+              title="Default Location for Chats"
+              className="w-full"
+              placeholder="Office address, favorite coffee shop, zoom link, etc."
               value={location}
               onChange={(e) => {
                 setModified(true);
                 setLocation(e.target.value);
               }}
             />
-            <TitledInput
-              title="Default Link for Online Chats"
-              placeholder="Permanent Zoom link, Google Meets link, etc."
-              value={videoChatLink}
-              onChange={(e) => {
-                setModified(true);
-                setVideoChatLink(e.target.value);
-              }}
-            />
           </Card>
         ) : (
           <div>Loading</div>

From 43f2913a69847fc9261e01fdb46b89f393b1572f Mon Sep 17 00:00:00 2001
From: Ashley <ashleyrawr74@gmail.com>
Date: Tue, 24 Aug 2021 14:52:42 -0700
Subject: [PATCH 4/6] Autofill mentee location when booking a chat

---
 src/components/BookAChat/index.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/BookAChat/index.tsx b/src/components/BookAChat/index.tsx
index 09ea69f2..fcbb2512 100644
--- a/src/components/BookAChat/index.tsx
+++ b/src/components/BookAChat/index.tsx
@@ -1,7 +1,7 @@
 import { addMinutes } from "date-fns";
 import dateFormat from "dateformat";
 import _ from "lodash";
-import React, { Fragment, useMemo, useState } from "react";
+import React, { Fragment, useEffect, useMemo, useState } from "react";
 import {
   CreateChatRequestInput,
   DateInterval,
@@ -118,6 +118,10 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
     user?.getMyUser.defaultLocation
   );
 
+  useEffect(() => {
+    setPreferredLocation(user?.getMyUser.defaultLocation);
+  }, [user?.getMyUser]);
+
   loadingCreateChatRequest; // TODO: Use this variable
 
   if (!fromUTC || !toUTC) return <Fragment />;
@@ -285,6 +289,7 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
                     setSendChatModalOpen(true);
                     setSelectedTimeslot(timeslot);
                     setChatRequestMessage("");
+                    setPreferredLocation("");
                   }}
                 >
                   {dateFormat(timeslot.startTime, "h:MMtt")} -{" "}
@@ -333,7 +338,7 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
             General Profile. Keep in mind that the mentor has the final say on
             location!
           </Text>
-          <div className="h-2" />
+          <div className="h-4" />
           <Input
             placeholder="Favorite coffee shop address, zoom link, or other"
             className="w-full"

From 53ea3ad1748ddcf2e0329092d612bc99b7dabd27 Mon Sep 17 00:00:00 2001
From: Ashley <ashleyrawr74@gmail.com>
Date: Sun, 19 Sep 2021 15:47:52 -0700
Subject: [PATCH 5/6] Changed the naming for the location variables

---
 src/components/BookAChat/index.tsx            | 15 +++++----
 src/components/ProfileModal.tsx               | 32 +++++++++++--------
 .../ReviewChats/ChatRequestFilterer.tsx       |  6 ++--
 .../ReviewChats/MyChatsFilterer.tsx           |  2 ++
 .../chatRequests/acceptChatRequest.graphql    |  7 ++--
 src/graphql/queries/getChatRequests.graphql   |  4 +--
 src/graphql/queries/getMyUser.graphql         |  2 +-
 src/graphql/queries/getProfiles.graphql       |  2 +-
 src/pages/my/profile.tsx                      |  8 +++--
 9 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/src/components/BookAChat/index.tsx b/src/components/BookAChat/index.tsx
index fcbb2512..46edaa7a 100644
--- a/src/components/BookAChat/index.tsx
+++ b/src/components/BookAChat/index.tsx
@@ -114,12 +114,12 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
   const [loadingCreateChatRequest, setLoadingCreateChatRequest] =
     useState(false);
   const [chatRequestMessage, setChatRequestMessage] = useState("");
-  const [preferredLocation, setPreferredLocation] = useState(
-    user?.getMyUser.defaultLocation
+  const [location, setlocation] = useState(
+    user?.getMyUser.preferredChatLocation
   );
 
   useEffect(() => {
-    setPreferredLocation(user?.getMyUser.defaultLocation);
+    setlocation(user?.getMyUser.preferredChatLocation);
   }, [user?.getMyUser]);
 
   loadingCreateChatRequest; // TODO: Use this variable
@@ -284,12 +284,13 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
             {timeslots.map((timeslot) => {
               return (
                 <button
+                  key={timeslot.startTime.toISOString()}
                   className="border border-inactive text-center w-full p-2 cursor-pointer hover:border-primary duration-150"
                   onClick={() => {
                     setSendChatModalOpen(true);
                     setSelectedTimeslot(timeslot);
                     setChatRequestMessage("");
-                    setPreferredLocation("");
+                    setlocation("");
                   }}
                 >
                   {dateFormat(timeslot.startTime, "h:MMtt")} -{" "}
@@ -342,8 +343,8 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
           <Input
             placeholder="Favorite coffee shop address, zoom link, or other"
             className="w-full"
-            value={preferredLocation}
-            onChange={(e) => setPreferredLocation(e.target.value)}
+            value={location}
+            onChange={(e) => setlocation(e.target.value)}
           />
           <div className="h-6" />
           <Text b className="w-full">
@@ -379,7 +380,7 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
                 const createChatRequestInput: CreateChatRequestInput = {
                   mentorProfileId: mentor.profileId,
                   chatRequestMessage: chatRequestMessage,
-                  location: preferredLocation || "",
+                  chatLocation: location || "",
                   chatStartTime: toUTC(selectedTimeslot.startTime).getTime(),
                   chatEndTime: toUTC(selectedTimeslot.endTime).getTime(),
                 };
diff --git a/src/components/ProfileModal.tsx b/src/components/ProfileModal.tsx
index 54214089..45a04dd0 100644
--- a/src/components/ProfileModal.tsx
+++ b/src/components/ProfileModal.tsx
@@ -76,20 +76,24 @@ const ProfileModal = ({
                 <div>
                   <div className="rounded bg-tertiary p-4">
                     <table className="table-auto w-96">
-                      <tr>
-                        <td>
-                          <Text b>Email:</Text>
-                        </td>
-                        <td className="pl-4">
-                          <Text>{profile.user.email}</Text>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td>
-                          <Text b>Preferred Location:</Text>
-                        </td>
-                        <td className="pl-4">{profile.user.defaultLocation}</td>
-                      </tr>
+                      <tbody>
+                        <tr>
+                          <td>
+                            <Text b>Email:</Text>
+                          </td>
+                          <td className="pl-4">
+                            <Text>{profile.user.email}</Text>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            <Text b>Preferred Location:</Text>
+                          </td>
+                          <td className="pl-4">
+                            {profile.user.preferredChatLocation}
+                          </td>
+                        </tr>
+                      </tbody>
                     </table>
                   </div>
                 </div>
diff --git a/src/components/ReviewChats/ChatRequestFilterer.tsx b/src/components/ReviewChats/ChatRequestFilterer.tsx
index 31b50643..a7a6e9f5 100644
--- a/src/components/ReviewChats/ChatRequestFilterer.tsx
+++ b/src/components/ReviewChats/ChatRequestFilterer.tsx
@@ -114,12 +114,12 @@ const ChatRequestListItem = ({
 
   const [isSetLocationModalOpen, setSetLocationModalOpen] = useState(false);
   const [location, setLocation] = useState(
-    chatRequest.mentorProfile.user.defaultLocation
+    chatRequest.mentorProfile.user.preferredChatLocation
   );
   const [acceptChatRequestMutation] = useAcceptChatRequestMutation({
     variables: {
       chatRequestId: chatRequest.chatRequestId,
-      location: location,
+      chatLocation: location,
     },
     refetchQueries: [
       refetchGetChatRequestsQuery({
@@ -199,7 +199,7 @@ const ChatRequestListItem = ({
             {chatRequest.menteeProfile.user.firstName} has specified that they
             prefer to meet here:
             <br className="h-2" />
-            <Text i>{chatRequest.location}</Text>
+            <Text i>{chatRequest.chatLocation}</Text>
           </Text>
           <TitledInput
             title="Confirm the location:"
diff --git a/src/components/ReviewChats/MyChatsFilterer.tsx b/src/components/ReviewChats/MyChatsFilterer.tsx
index b3e8a71d..f799ba41 100644
--- a/src/components/ReviewChats/MyChatsFilterer.tsx
+++ b/src/components/ReviewChats/MyChatsFilterer.tsx
@@ -169,12 +169,14 @@ type MyChatsFiltererProps = {
 };
 
 export const MyChatsFilterer = ({ profileId }: MyChatsFiltererProps) => {
+  console.log(profileId);
   const { data } = useGetChatRequestsQuery({
     variables: {
       profileId,
     },
   });
 
+  console.log(data);
   const filterOptions: {
     [key: string]: (
       applicationList: ChatRequestPartial[]
diff --git a/src/graphql/mutations/chatRequests/acceptChatRequest.graphql b/src/graphql/mutations/chatRequests/acceptChatRequest.graphql
index a38c4474..bf4d9733 100644
--- a/src/graphql/mutations/chatRequests/acceptChatRequest.graphql
+++ b/src/graphql/mutations/chatRequests/acceptChatRequest.graphql
@@ -1,5 +1,8 @@
-mutation acceptChatRequest($chatRequestId: String!, $location: String!) {
-  acceptChatRequest(chatRequestId: $chatRequestId, location: $location) {
+mutation acceptChatRequest($chatRequestId: String!, $chatLocation: String!) {
+  acceptChatRequest(
+    chatRequestId: $chatRequestId
+    chatLocation: $chatLocation
+  ) {
     chatRequestId
   }
 }
diff --git a/src/graphql/queries/getChatRequests.graphql b/src/graphql/queries/getChatRequests.graphql
index 960ab868..9801c901 100644
--- a/src/graphql/queries/getChatRequests.graphql
+++ b/src/graphql/queries/getChatRequests.graphql
@@ -6,7 +6,7 @@ query getChatRequests($profileId: String!) {
     chatEndTime
     chatRequestMessage
     chatRejectMessage
-    location
+    chatLocation
     mentorProfileId
     mentorProfile {
       profileJson
@@ -14,7 +14,7 @@ query getChatRequests($profileId: String!) {
       bio
       user {
         email
-        defaultLocation
+        preferredChatLocation
         firstName
         lastName
         profilePictureUrl
diff --git a/src/graphql/queries/getMyUser.graphql b/src/graphql/queries/getMyUser.graphql
index 7302450e..8844b86e 100644
--- a/src/graphql/queries/getMyUser.graphql
+++ b/src/graphql/queries/getMyUser.graphql
@@ -4,7 +4,7 @@ query getMyUser {
     email
     firstName
     lastName
-    defaultLocation
+    preferredChatLocation
     profilePictureUrl
     timezone
     profiles {
diff --git a/src/graphql/queries/getProfiles.graphql b/src/graphql/queries/getProfiles.graphql
index 9034f5c0..ff0e4f61 100644
--- a/src/graphql/queries/getProfiles.graphql
+++ b/src/graphql/queries/getProfiles.graphql
@@ -8,7 +8,7 @@ query getProfiles($programId: String!, $profileType: String!) {
     user {
       userId
       email
-      defaultLocation
+      preferredChatLocation
       firstName
       lastName
       profilePictureUrl
diff --git a/src/pages/my/profile.tsx b/src/pages/my/profile.tsx
index 64474774..2fc9bbfa 100644
--- a/src/pages/my/profile.tsx
+++ b/src/pages/my/profile.tsx
@@ -24,7 +24,9 @@ const GeneralProfile: Page = () => {
   const [modified, setModified] = useState(false);
   const [firstName, setFirstName] = useState(data?.getMyUser.firstName);
   const [lastName, setLastName] = useState(data?.getMyUser.lastName);
-  const [location, setLocation] = useState(data?.getMyUser.defaultLocation);
+  const [location, setLocation] = useState(
+    data?.getMyUser.preferredChatLocation
+  );
   const { setSnackbarMessage } = useSnackbar();
 
   const [profilePicture, setProfilePicture] = useState<File | null>();
@@ -39,7 +41,7 @@ const GeneralProfile: Page = () => {
       setFirstName(data.getMyUser.firstName);
       setLastName(data.getMyUser.lastName);
       setSrc(data.getMyUser.profilePictureUrl);
-      setLocation(data.getMyUser.defaultLocation);
+      setLocation(data.getMyUser.preferredChatLocation);
       setProfilePicture(null);
       setError(null);
     }
@@ -83,7 +85,7 @@ const GeneralProfile: Page = () => {
                     firstName: firstName,
                     lastName: lastName,
                     profilePictureUrl: url,
-                    defaultLocation: location,
+                    preferredChatLocation: location,
                   },
                 },
               });

From a684804d2e80fcf9fdf60bf71440fba757315fcc Mon Sep 17 00:00:00 2001
From: Ashley <ashleyrawr74@gmail.com>
Date: Mon, 20 Sep 2021 03:45:55 -0700
Subject: [PATCH 6/6] Fixed bug related to being unable to see mentee chat
 requests

---
 src/components/BookAChat/index.tsx             | 18 ++++++++++++------
 src/components/ReviewChats/MyChatsFilterer.tsx |  2 --
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/BookAChat/index.tsx b/src/components/BookAChat/index.tsx
index 46edaa7a..a8b8a28a 100644
--- a/src/components/BookAChat/index.tsx
+++ b/src/components/BookAChat/index.tsx
@@ -13,6 +13,7 @@ import {
   useGetChatRequestsQuery,
   useGetMyUserQuery,
 } from "../../generated/graphql";
+import { useCurrentProfile } from "../../hooks";
 import useTimezoneConverters from "../../hooks/useTimezoneConverters";
 import { Button, Card, Input, Modal, Text, TextArea } from "../atomic";
 import Calendar from "../Calendar";
@@ -103,6 +104,7 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
       variables: { profileId: mentor.profileId },
     });
   const { data: user } = useGetMyUserQuery();
+  const currentProfile = useCurrentProfile();
 
   const [createChatRequest] = useCreateChatRequestMutation({
     refetchQueries: [
@@ -124,7 +126,8 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
 
   loadingCreateChatRequest; // TODO: Use this variable
 
-  if (!fromUTC || !toUTC) return <Fragment />;
+  if (!fromUTC || !toUTC || !user || !currentProfile.currentProfile)
+    return <Fragment />;
 
   const extractDates = (
     input: {
@@ -379,6 +382,7 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
                 setLoadingCreateChatRequest(true);
                 const createChatRequestInput: CreateChatRequestInput = {
                   mentorProfileId: mentor.profileId,
+                  menteeProfileId: currentProfile.currentProfile.profileId,
                   chatRequestMessage: chatRequestMessage,
                   chatLocation: location || "",
                   chatStartTime: toUTC(selectedTimeslot.startTime).getTime(),
@@ -388,11 +392,13 @@ const BookAChat = ({ mentor }: BookAChatProps) => {
                   variables: {
                     data: createChatRequestInput,
                   },
-                }).then(() => {
-                  setLoadingCreateChatRequest(false);
-                  setSendChatModalOpen(false);
-                  _.delay(setChatSentConfirmModalOpen, 250, true);
-                });
+                })
+                  .catch((err) => console.log(err))
+                  .then(() => {
+                    setLoadingCreateChatRequest(false);
+                    setSendChatModalOpen(false);
+                    _.delay(setChatSentConfirmModalOpen, 250, true);
+                  });
               }}
             >
               Send
diff --git a/src/components/ReviewChats/MyChatsFilterer.tsx b/src/components/ReviewChats/MyChatsFilterer.tsx
index f799ba41..b3e8a71d 100644
--- a/src/components/ReviewChats/MyChatsFilterer.tsx
+++ b/src/components/ReviewChats/MyChatsFilterer.tsx
@@ -169,14 +169,12 @@ type MyChatsFiltererProps = {
 };
 
 export const MyChatsFilterer = ({ profileId }: MyChatsFiltererProps) => {
-  console.log(profileId);
   const { data } = useGetChatRequestsQuery({
     variables: {
       profileId,
     },
   });
 
-  console.log(data);
   const filterOptions: {
     [key: string]: (
       applicationList: ChatRequestPartial[]