Robosats/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2025-07-19 09:13:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1960 from RoboSats/fix-range-and-table

Browse Source 
Fix Range and Date on maker creation
This commit is contained in:
KoalaSat
2025-05-24 18:46:24 +00:00
committed by GitHub
parent 8de43de4fb 63874d885a
commit 66da1e7d95
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/MakerForm/AmountRange.tsx
View File

@ -115,7 +115,7 @@ const AmountRange: React.FC<AmountRangeProps> = ({
}; };
useEffect(() => { useEffect(() => {
setHasRangeError(!minAmountError || !maxAmountError); setHasRangeError(minAmountError || maxAmountError);
}, [minAmountError, maxAmountError]); }, [minAmountError, maxAmountError]);
return ( return (

27
frontend/src/components/MakerForm/MakerForm.tsx
View File

@ -1,7 +1,6 @@
import React, { useContext, useEffect, useMemo, useState } from 'react'; import React, { useContext, useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { import {
InputAdornment,
ButtonGroup, ButtonGroup,
Slider, Slider,
Switch, Switch,
@ -34,7 +33,7 @@ import AmountRange from './AmountRange';
import currencyDict from '../../../static/assets/currencies.json'; import currencyDict from '../../../static/assets/currencies.json';
import { amountToString, computeSats, genBase62Token, pn } from '../../utils'; import { amountToString, computeSats, genBase62Token, pn } from '../../utils';
import { SelfImprovement, Lock, HourglassTop, DeleteSweep, Edit, Map } from '@mui/icons-material'; import { SelfImprovement, Lock, DeleteSweep, Edit, Map } from '@mui/icons-material';
import { LoadingButton } from '@mui/lab'; import { LoadingButton } from '@mui/lab';
import { fiatMethods } from '../PaymentMethods'; import { fiatMethods } from '../PaymentMethods';
import { AppContext, type UseAppStoreType } from '../../contexts/AppContext'; import { AppContext, type UseAppStoreType } from '../../contexts/AppContext';
@ -76,6 +75,8 @@ const MakerForm = ({
const [submittingRequest, setSubmittingRequest] = useState<boolean>(false); const [submittingRequest, setSubmittingRequest] = useState<boolean>(false);
const [amountRangeEnabled, setAmountRangeEnabled] = useState<boolean>(true); const [amountRangeEnabled, setAmountRangeEnabled] = useState<boolean>(true);
const [hasRangeError, setHasRangeError] = useState<boolean>(false); const [hasRangeError, setHasRangeError] = useState<boolean>(false);
const [openPublicDuration, setOpenPublicDuration] = useState<boolean>(false);
const [openEscrowTimer, setOpenEscrowTimer] = useState<boolean>(false);
const [limits, setLimits] = useState<LimitList>({}); const [limits, setLimits] = useState<LimitList>({});
const amountSafeThresholds = [1.03, 0.98]; const amountSafeThresholds = [1.03, 0.98];
@ -823,12 +824,12 @@ const MakerForm = ({
<Grid item sx={{ width: '100%' }}> <Grid item sx={{ width: '100%' }}>
<LocalizationProvider dateAdapter={AdapterDateFns}> <LocalizationProvider dateAdapter={AdapterDateFns}>
<MobileTimePicker <MobileTimePicker
open={openPublicDuration}
onClose={() => setOpenPublicDuration(false)}
ampm={false} ampm={false}
localeText={{ timePickerToolbarTitle: t('Public order length') }} localeText={{ toolbarTitle: t('Public order length') }}
openTo='hours' openTo='hours'
views={['hours', 'minutes']} views={['hours', 'minutes']}
inputFormat='HH:mm'
mask='__:__'
slotProps={{ slotProps={{
textField: { textField: {
fullWidth: true, fullWidth: true,
@ -838,11 +839,7 @@ const MakerForm = ({
borderRadius: '4px', borderRadius: '4px',
marginBottom: 8, marginBottom: 8,
}, },
endAdornment: ( onClick: () => setOpenPublicDuration(true),
<InputAdornment position='end'>
<HourglassTop />
</InputAdornment>
),
}, },
}, },
}} }}
@ -859,7 +856,9 @@ const MakerForm = ({
<LocalizationProvider dateAdapter={AdapterDateFns}> <LocalizationProvider dateAdapter={AdapterDateFns}>
<MobileTimePicker <MobileTimePicker
ampm={false} ampm={false}
localeText={{ timePickerToolbarTitle: t('Escrow/invoice step length') }} open={openEscrowTimer}
onClose={() => setOpenEscrowTimer(false)}
localeText={{ toolbarTitle: t('Escrow/invoice step length') }}
openTo='hours' openTo='hours'
views={['hours', 'minutes']} views={['hours', 'minutes']}
inputFormat='HH:mm' inputFormat='HH:mm'
@ -873,11 +872,7 @@ const MakerForm = ({
borderRadius: '4px', borderRadius: '4px',
marginBottom: 8, marginBottom: 8,
}, },
endAdornment: ( onClick: () => setOpenEscrowTimer(true),
<InputAdornment position='end'>
<HourglassTop />
</InputAdornment>
),
}, },
}, },
}} }}