[#521] Fix active Submit button on last question group

akvo · Mar 6, 2024 · 53888bf · 53888bf
1 parent 5ac933a
commit 53888bf
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/frontend/src/akvo-react-form/index.js b/frontend/src/akvo-react-form/index.js
@@ -3,7 +3,15 @@ import { Row, Col, Button, Form, Space, Select, message } from "antd";
 // import "antd/dist/antd.min.css";
 import "./styles.css";
 import moment from "moment";
-import { range, intersection, maxBy, isEmpty, takeRight, take } from "lodash";
+import {
+  range,
+  intersection,
+  maxBy,
+  isEmpty,
+  takeRight,
+  take,
+  last,
+} from "lodash";
 import {
   transformForm,
   translateForm,
@@ -504,8 +512,9 @@ export const Webform = ({
   };
 
   const isLastGroup = useMemo(() => {
-    return activeGroup + 1 === formsMemo?.question_group?.length;
-  }, [activeGroup, formsMemo]);
+    const lastShownGroup = last(showGroup);
+    return activeGroup === lastShownGroup;
+  }, [activeGroup, showGroup]);
 
   if (!formsMemo?.question_group) {
     return "Error Format";