From 47723217625ee0d2461a8c2cde3363d7c4e9016d Mon Sep 17 00:00:00 2001
From: Domenic Horner <domenic@tgxn.net>
Date: Sat, 4 Nov 2023 13:44:00 +0800
Subject: [PATCH] fix for expires on ban user from site

---
 src/components/Actions/GenButtons.jsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/Actions/GenButtons.jsx b/src/components/Actions/GenButtons.jsx
index 91c8d7d..0f01ffe 100644
--- a/src/components/Actions/GenButtons.jsx
+++ b/src/components/Actions/GenButtons.jsx
@@ -188,14 +188,6 @@ export const BanUserSiteButton = ({ person, ...props }) => {
             placeholder={`${actionText.toLowerCase()} reason`}
           />,
           !person.banned ? (
-            <CheckboxElement
-              key="removeData"
-              inputText="Remove Data"
-              value={removeData}
-              setValue={setRemoveData}
-            />
-          ) : null,
-          !person ? (
             <ExpiryLengthElement
               key="banExpires"
               inputText="Ban Expires"
@@ -203,6 +195,14 @@ export const BanUserSiteButton = ({ person, ...props }) => {
               setValue={setExpires}
             />
           ) : null,
+          !person.banned ? (
+            <CheckboxElement
+              key="removeData"
+              inputText="Remove Data"
+              value={removeData}
+              setValue={setRemoveData}
+            />
+          ) : null,
         ]}
         // disabled={banReason == ""}
         buttonMessage={actionText}