diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json
index 4b8be58..7e65a6c 100644
--- a/src/assets/i18n/ru.json
+++ b/src/assets/i18n/ru.json
@@ -64,6 +64,15 @@
"primaryColor": "Основной цвет",
"backgroundTone": "Тон фона"
},
+ "integrationCommon": {
+ "title": "Общее",
+ "insertStrategyLabel": "Автодобавление ставок",
+ "insertStrategy": {
+ "force": "Всегда",
+ "match": "При полном совпадении имени",
+ "none": "Никогда"
+ }
+ },
"twitch": {
"openRewards": "Включить награды",
"closeRewards": "Скрыть награды",
diff --git a/src/components/Changelog/ChangelogModal/ChangelogModal.tsx b/src/components/Changelog/ChangelogModal/ChangelogModal.tsx
index a216566..9060196 100644
--- a/src/components/Changelog/ChangelogModal/ChangelogModal.tsx
+++ b/src/components/Changelog/ChangelogModal/ChangelogModal.tsx
@@ -1,6 +1,5 @@
import { FC, useEffect, useMemo, useState } from 'react';
import { Button, Dialog, DialogActions, DialogContent, DialogTitle } from '@mui/material';
-import dayjs from 'dayjs';
import { getUpdates } from '@utils/changelog.tsx';
diff --git a/src/components/IntegrationPage/IntegrationCommon/index.tsx b/src/components/IntegrationPage/IntegrationCommon/index.tsx
new file mode 100644
index 0000000..50bd2ca
--- /dev/null
+++ b/src/components/IntegrationPage/IntegrationCommon/index.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { Controller, useFormContext } from 'react-hook-form';
+import { FormControl, MenuItem, Select, Typography, FormGroup } from '@mui/material';
+
+import SettingsGroupTitle from '@components/SettingsGroupTitle/SettingsGroupTitle.tsx';
+import { InsertStrategy } from '@enums/settings.enum.ts';
+
+const IntegrationCommon = () => {
+ const { t } = useTranslation(undefined, { keyPrefix: 'settings.integrationCommon' });
+ const { control } = useFormContext();
+
+ return (
+ <>
+
+
+
+ {t('insertStrategyLabel')}
+
+ (
+
+
+
+ )}
+ />
+
+ >
+ );
+};
+
+export default IntegrationCommon;
diff --git a/src/components/IntegrationPage/IntegrationPage.tsx b/src/components/IntegrationPage/IntegrationPage.tsx
index fb09d22..020ddb8 100644
--- a/src/components/IntegrationPage/IntegrationPage.tsx
+++ b/src/components/IntegrationPage/IntegrationPage.tsx
@@ -1,12 +1,13 @@
import { FC, useCallback, useEffect } from 'react';
import { useDispatch, useSelector } from 'react-redux';
-import { useForm } from 'react-hook-form';
+import { FormProvider, useForm } from 'react-hook-form';
import { useTranslation } from 'react-i18next';
import { initialState, saveSettings } from '@reducers/AucSettings/AucSettings.ts';
import { getDirtyValues } from '@utils/common.utils.ts';
import { SettingsForm } from '@models/settings.model.ts';
import { RootState } from '@reducers';
+import IntegrationCommon from '@components/IntegrationPage/IntegrationCommon';
import PageContainer from '../PageContainer/PageContainer';
@@ -58,10 +59,13 @@ const IntegrationPage: FC = () => {
return (
-
+
+
+
);
};
diff --git a/src/components/SettingsPage/AucSettings/AucSettings.tsx b/src/components/SettingsPage/AucSettings/AucSettings.tsx
index 81b36d5..22b5ad0 100644
--- a/src/components/SettingsPage/AucSettings/AucSettings.tsx
+++ b/src/components/SettingsPage/AucSettings/AucSettings.tsx
@@ -1,15 +1,11 @@
import { FC, useEffect } from 'react';
-import { FormGroup, IconButton, MenuItem, Select, Typography, Grid, FormControl } from '@mui/material';
+import { FormGroup, IconButton, Typography } from '@mui/material';
import ReplayIcon from '@mui/icons-material/Replay';
-import { Control, Controller, UseFormReturn } from 'react-hook-form';
-import ArrowUpwardOutlinedIcon from '@mui/icons-material/ArrowUpwardOutlined';
-import ArrowDownwardOutlinedIcon from '@mui/icons-material/ArrowDownwardOutlined';
-import { useSelector } from 'react-redux';
+import { Control, UseFormReturn } from 'react-hook-form';
import { useTranslation } from 'react-i18next';
import ImageLinkInput from '@components/Form/ImageLinkInput/ImageLinkInput';
import SettingsGroupTitle from '@components/SettingsGroupTitle/SettingsGroupTitle';
-import { RootState } from '@reducers';
import FormSwitch from '@components/Form/FormSwitch/FormSwitch';
import FormInput from '@components/Form/FormInput/FormInput';
import ImagePresetsInput from '@components/Form/ImagePresetsInput/ImagePresetsInput';
diff --git a/src/components/SettingsPage/AucSettings/BidsSortSelect.tsx b/src/components/SettingsPage/AucSettings/BidsSortSelect.tsx
index 9536230..653233d 100644
--- a/src/components/SettingsPage/AucSettings/BidsSortSelect.tsx
+++ b/src/components/SettingsPage/AucSettings/BidsSortSelect.tsx
@@ -22,9 +22,16 @@ const BidsSortSelect: FC = ({ control }) => {
control={control}
name='purchaseSort'
defaultValue={purchaseSort}
- render={({ field: { onChange, value } }) => (
+ render={({ field: { onChange, onBlur, value } }) => (
-