Merge remote-tracking branch 'upstream/master'

client/src/pages/settings/extraFieldsSettings.tsx

@@ -1,3 +1,5 @@
+import { PlusOutlined } from "@ant-design/icons";
+import { useTranslate } from "@refinedev/core";
 import {
   Button,
   Checkbox,
@@ -12,20 +14,18 @@ import {
   Table,
   message,
 } from "antd";
-import { EntityType, Field, FieldType, useDeleteField, useGetFields, useSetField } from "../../utils/queryFields";
-import { useTranslate } from "@refinedev/core";
-import { useState } from "react";
+import { FormItemProps, Rule } from "antd/es/form";
 import { ColumnType } from "antd/es/table";
+import dayjs from "dayjs";
+import advancedFormat from "dayjs/plugin/advancedFormat";
+import timezone from "dayjs/plugin/timezone";
+import utc from "dayjs/plugin/utc";
+import { useState } from "react";
 import { Trans } from "react-i18next";
 import { useParams } from "react-router-dom";
-import { FormItemProps, Rule } from "antd/es/form";
-import { PlusOutlined } from "@ant-design/icons";
-import dayjs from "dayjs";
-import utc from "dayjs/plugin/utc";
-import timezone from "dayjs/plugin/timezone";
-import advancedFormat from "dayjs/plugin/advancedFormat";
 import { DateTimePicker } from "../../components/dateTimePicker";
 import { InputNumberRange } from "../../components/inputNumberRange";
+import { EntityType, Field, FieldType, useDeleteField, useGetFields, useSetField } from "../../utils/queryFields";
 
 dayjs.extend(utc);
 dayjs.extend(timezone);

client/src/pages/settings/generalSettings.tsx

@@ -1,17 +1,17 @@
-import React from "react";
 import { useTranslate } from "@refinedev/core";
 import { Button, Form, Input, message } from "antd";
+import { useEffect } from "react";
 import { useGetSettings, useSetSetting } from "../../utils/querySettings";
 
 export function GeneralSettings() {
   const settings = useGetSettings();
-  const setSetting = useSetSetting();
+  const setCurrency = useSetSetting("currency");
   const [form] = Form.useForm();
   const [messageApi, contextHolder] = message.useMessage();
   const t = useTranslate();
 
   // Set initial form values
-  React.useEffect(() => {
+  useEffect(() => {
     if (settings.data) {
       form.setFieldsValue({
         currency: JSON.parse(settings.data.currency.value),
@@ -21,20 +21,17 @@ export function GeneralSettings() {
   }, [settings.data, form]);
 
   // Popup message if setSetting is successful
-  React.useEffect(() => {
-    if (setSetting.isSuccess) {
+  useEffect(() => {
+    if (setCurrency.isSuccess) {
       messageApi.success(t("notifications.saveSuccessful"));
     }
-  }, [setSetting.isSuccess, messageApi, t]);
+  }, [setCurrency.isSuccess, messageApi, t]);
 
   // Handle form submit
   const onFinish = (values: { currency: string, qr_code_url: string }) => {
     // Check if the currency has changed
     if (settings.data?.currency.value !== JSON.stringify(values.currency)) {
-      setSetting.mutate({
-        key: "currency",
-        value: JSON.stringify(values.currency),
-      });
+      setCurrency.mutate(values.currency);
     }
     // Check if the QR code URL has changed
     if (settings.data?.qr_code_url.value !== JSON.stringify(values.qr_code_url)) {
@@ -94,7 +91,7 @@ export function GeneralSettings() {
         </Form.Item>
 
         <Form.Item wrapperCol={{ offset: 8, span: 16 }}>
-          <Button type="primary" htmlType="submit" loading={settings.isFetching || setSetting.isLoading}>
+          <Button type="primary" htmlType="submit" loading={settings.isFetching || setCurrency.isLoading}>
             {t("buttons.save")}
           </Button>
         </Form.Item>

client/src/pages/settings/index.tsx

@@ -1,13 +1,13 @@
-import React from "react";
+import { FileOutlined, HighlightOutlined, SolutionOutlined, ToolOutlined, UserOutlined } from "@ant-design/icons";
 import { IResourceComponentsProps, useTranslate } from "@refinedev/core";
+import { Menu, theme } from "antd";
+import { Content } from "antd/es/layout/layout";
 import dayjs from "dayjs";
 import utc from "dayjs/plugin/utc";
-import { Content } from "antd/es/layout/layout";
-import { Menu, theme } from "antd";
-import { FileOutlined, HighlightOutlined, SolutionOutlined, ToolOutlined, UserOutlined } from "@ant-design/icons";
-import { GeneralSettings } from "./generalSettings";
-import { ExtraFieldsSettings } from "./extraFieldsSettings";
+import React from "react";
 import { Route, Routes, useNavigate } from "react-router-dom";
+import { ExtraFieldsSettings } from "./extraFieldsSettings";
+import { GeneralSettings } from "./generalSettings";
 
 dayjs.extend(utc);