From def74df956bee9aabfe4e390ff42b8300ad7c2e8 Mon Sep 17 00:00:00 2001
From: Harsh Gupta <harshhvg999@gmail.com>
Date: Tue, 7 Jul 2026 20:54:33 -0400
Subject: [PATCH] fix(filters): preserve values when collapsed

---
 src/components/CaptureFilter.js       | 1 +
 src/components/CaptureFilterHeader.js | 4 ++--
 src/components/FilterTop.js           | 1 +
 src/components/FilterTopGrower.js     | 1 +
 src/components/GrowerFilterHeader.js  | 4 ++--
 src/components/Verify.js              | 4 ++--
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/CaptureFilter.js b/src/components/CaptureFilter.js
index e91a266be..fd74ef0ad 100644
--- a/src/components/CaptureFilter.js
+++ b/src/components/CaptureFilter.js
@@ -172,6 +172,7 @@ function Filter(props) {
     filter.tokenId = tokenId;
     filter.verifyStatus = verifyStatus;
     props.onSubmit && props.onSubmit(filter);
+    props.onClick && props.onClick();
   }
 
   function handleReset() {
diff --git a/src/components/CaptureFilterHeader.js b/src/components/CaptureFilterHeader.js
index bd773e623..9ffad77b5 100644
--- a/src/components/CaptureFilterHeader.js
+++ b/src/components/CaptureFilterHeader.js
@@ -50,14 +50,14 @@ function CaptureFilterHeader(props) {
           </Button>,
         ]}
       >
-        {isFilterShown && (
+        <div style={{ display: isFilterShown ? 'block' : 'none' }}>
           <CaptureFilter
             isOpen={isFilterShown}
             onSubmit={handleFilterSubmit}
             filter={capturesContext.filter}
             onClick={handleFilterClick}
           />
-        )}
+        </div>
       </Navbar>
     </Grid>
   );
diff --git a/src/components/FilterTop.js b/src/components/FilterTop.js
index 487bf6356..2c9bca798 100644
--- a/src/components/FilterTop.js
+++ b/src/components/FilterTop.js
@@ -133,6 +133,7 @@ function Filter(props) {
     filter.stakeholderUUID = stakeholderUUID;
     filter.tokenId = tokenId;
     props.onSubmit && props.onSubmit(filter);
+    props.onClose && props.onClose();
   }
 
   function handleReset() {
diff --git a/src/components/FilterTopGrower.js b/src/components/FilterTopGrower.js
index 5d534ca48..aa48c4e38 100644
--- a/src/components/FilterTopGrower.js
+++ b/src/components/FilterTopGrower.js
@@ -73,6 +73,7 @@ function FilterTopGrower(props) {
       deviceIdentifier,
     });
     props.onSubmit && props.onSubmit(filter);
+    props.onClick && props.onClick();
   }
 
   const handleReset = () => {
diff --git a/src/components/GrowerFilterHeader.js b/src/components/GrowerFilterHeader.js
index 2f5ba6bd8..90191fb8b 100644
--- a/src/components/GrowerFilterHeader.js
+++ b/src/components/GrowerFilterHeader.js
@@ -50,14 +50,14 @@ function GrowersFilterHeader(props) {
           </Button>,
         ]}
       >
-        {isFilterShown && (
+        <div style={{ display: isFilterShown ? 'block' : 'none' }}>
           <FilterTopGrower
             isOpen={isFilterShown}
             onSubmit={handleFilterSubmit}
             filter={growerContext.filter}
             onClick={handleFilterClick}
           />
-        )}
+        </div>
       </Navbar>
     </Grid>
   );
diff --git a/src/components/Verify.js b/src/components/Verify.js
index 101bc2941..be6226af2 100644
--- a/src/components/Verify.js
+++ b/src/components/Verify.js
@@ -586,7 +586,7 @@ const Verify = (props) => {
                 </Button>,
               ]}
             >
-              {isFilterShown && (
+              <div style={{ display: isFilterShown ? 'block' : 'none' }}>
                 <FilterTop
                   isOpen={isFilterShown}
                   onSubmit={(filter) => {
@@ -595,7 +595,7 @@ const Verify = (props) => {
                   filter={verifyContext.filter}
                   onClose={handleFilterClick}
                 />
-              )}
+              </div>
             </Navbar>
           </Grid>
           <Grid