From b6271b8ef2b0098e0d8291f85c5093ff08eb220b Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 23 Oct 2025 12:25:13 -0700 Subject: [PATCH] Resolve flatlist end covered. --- .gitignore | 2 ++ components/jobs-list/job-list-item.jsx | 13 ++++++++++--- components/jobs-list/jobs-list.jsx | 21 +-------------------- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 83e2643..067a219 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,8 @@ yarn-error.log *.ipa *.aab +*.tar.gz +*.apk .expo android/** diff --git a/components/jobs-list/job-list-item.jsx b/components/jobs-list/job-list-item.jsx index 3f55e6a..68373ad 100644 --- a/components/jobs-list/job-list-item.jsx +++ b/components/jobs-list/job-list-item.jsx @@ -44,6 +44,9 @@ function JobListItemComponent({ openImagePicker, item }) { }`.trim(); const roNumber = item.ro_number || t("general.labels.na"); + if (item.id === "footer-spacer") { + return ; + } return ( {vehicle} @@ -155,11 +158,15 @@ const styles = StyleSheet.create({ opacity: 0.9, }, uploadButton: { - margin: 0, + marginLeft: 12, }, body: { marginTop: 2, - flexDirection: "row", gap: 8, alignItems: "center", + display: "flex", + flex: 1, + flexDirection: "row", + gap: 8, + alignItems: "center", }, ownerText: { fontWeight: "600", diff --git a/components/jobs-list/jobs-list.jsx b/components/jobs-list/jobs-list.jsx index eb44f1c..a9f7119 100644 --- a/components/jobs-list/jobs-list.jsx +++ b/components/jobs-list/jobs-list.jsx @@ -1,5 +1,4 @@ import { useQuery } from "@apollo/client"; -import { useLocalSearchParams } from "expo-router"; import React from "react"; import { useTranslation } from "react-i18next"; import { FlatList, RefreshControl, Text, View } from "react-native"; @@ -19,7 +18,6 @@ const mapStateToProps = createStructuredSelector({ export function JobListComponent({ bodyshop }) { const { t } = useTranslation(); - const { search } = useLocalSearchParams(); const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, { variables: { @@ -47,24 +45,7 @@ export function JobListComponent({ bodyshop }) { ); - const jobs = data - ? search === "" || !search - ? data.jobs - : data.jobs.filter( - (j) => - (j.ro_number || "") - .toString() - .toLowerCase() - .includes(search.toLowerCase()) || - (j.ownr_co_nm || "").toLowerCase().includes(search.toLowerCase()) || - (j.ownr_fn || "").toLowerCase().includes(search.toLowerCase()) || - (j.ownr_ln || "").toLowerCase().includes(search.toLowerCase()) || - (j.v_model_desc || "") - .toLowerCase() - .includes(search.toLowerCase()) || - (j.v_make_desc || "").toLowerCase().includes(search.toLowerCase()) - ) - : []; + const jobs = data ? [...(data?.jobs || []), { id: "footer-spacer" }] : []; return (