Merge pull request #97 from tgxn/fix_ban_site

fix for expires on ban user from site
tgxn · Nov 4, 2023 · 1489991 · 1489991
2 parents 9f2d06a + 4772321
commit 1489991
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/components/Actions/GenButtons.jsx b/src/components/Actions/GenButtons.jsx
@@ -188,21 +188,21 @@ 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"
               value={expires}
               setValue={setExpires}
             />
           ) : null,
+          !person.banned ? (
+            <CheckboxElement
+              key="removeData"
+              inputText="Remove Data"
+              value={removeData}
+              setValue={setRemoveData}
+            />
+          ) : null,
         ]}
         // disabled={banReason == ""}
         buttonMessage={actionText}