From 3f477e8dfb3ba67ca13d02869e99e57daed2075d Mon Sep 17 00:00:00 2001
From: gibbyb <gib@gibbyb.com>
Date: Mon, 21 Oct 2024 12:32:53 -0500
Subject: [PATCH] I believe most errors are fixed. Rewrite is basically
 complete

---
 components/chat/AccessoryBar.tsx     |  1 -
 components/chat/CustomView.tsx       |  2 +-
 components/home/RelationshipView.tsx | 18 +++++++++---------
 constants/APIs.ts                    |  4 ++++
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/components/chat/AccessoryBar.tsx b/components/chat/AccessoryBar.tsx
index 04e04a6..6591552 100644
--- a/components/chat/AccessoryBar.tsx
+++ b/components/chat/AccessoryBar.tsx
@@ -11,7 +11,6 @@ import {
 export default class AccessoryBar extends React.Component<any> {
   render () {
     const { onSend, isTyping } = this.props;
-
     return (
       <ThemedView style={styles.container}>
         <Button onPress={() => pickImageAsync(onSend)} name='photo' />
diff --git a/components/chat/CustomView.tsx b/components/chat/CustomView.tsx
index 0618923..52901a9 100644
--- a/components/chat/CustomView.tsx
+++ b/components/chat/CustomView.tsx
@@ -3,12 +3,12 @@ import * as Linking from 'expo-linking';
 import {
   Platform,
   StyleSheet,
+  TouchableOpacity,
   StyleProp,
   ViewStyle
 } from 'react-native';
 import { ThemedText, ThemedView } from '@/components/theme/Theme';
 import MapView from 'react-native-maps';
-import { TouchableOpacity } from 'react-native-gesture-handler';
 
 type Props = {
   currentMessage: any;
diff --git a/components/home/RelationshipView.tsx b/components/home/RelationshipView.tsx
index a77ee59..2d760a7 100644
--- a/components/home/RelationshipView.tsx
+++ b/components/home/RelationshipView.tsx
@@ -132,7 +132,13 @@ const RelationshipView: React.FC<RelationshipProps> = ({ pfpUrl }) => {
     if (!status || !status.relationship) {
       // Case 1: Not in a relationship
       return showRequestRelationship ? (
-        <RequestRelationship onRequestSent={handleRequestSent} />
+        <ThemedView>
+          <RequestRelationship onRequestSent={handleRequestSent} />
+          <TextButton
+            width={220} height={60} text='Stop searching' fontSize={18}
+            onPress={() => setShowRequestRelationship(false)}
+          />
+        </ThemedView>
       ) : (
         <TextButton
           width={220} height={60} text='Request Relationship' fontSize={18}
@@ -162,13 +168,8 @@ const RelationshipView: React.FC<RelationshipProps> = ({ pfpUrl }) => {
           </ThemedView>
           <ThemedView style={styles.buttonContainer}>
             <TextButton
-              width={100} height={40}
-              text='Accept' fontSize={18}
-              onPress={handleAcceptRequest}
-            />
-            <TextButton
-              width={100} height={40}
-              text='Reject' fontSize={18}
+              width={150} height={40}
+              text='Cancel Request' fontSize={18}
               onPress={handleRejectRequest}
             />
           </ThemedView>
@@ -291,7 +292,6 @@ const styles = StyleSheet.create({
     marginBottom: 10,
   },
   buttonContainer: {
-    flexDirection: 'row',
     justifyContent: 'space-around',
     width: '100%',
     marginTop: 20,
diff --git a/constants/APIs.ts b/constants/APIs.ts
index f6d7a9f..8343639 100644
--- a/constants/APIs.ts
+++ b/constants/APIs.ts
@@ -134,6 +134,10 @@ export const updateRelationshipStatus = async (userId: number, status: 'accepted
       }),
     });
     if (!response.ok) {
+      if (status === 'rejected') {
+        console.log('Relationship deleted.');
+        return null;
+      }
       throw new Error(
         `Error updating relationship status: ${response.status} ${response.statusText}`
       );