diff --git a/packages/pl-fe/src/features/compose/components/polls/duration-selector.tsx b/packages/pl-fe/src/features/compose/components/polls/duration-selector.tsx index 505fad53c..38b0601b0 100644 --- a/packages/pl-fe/src/features/compose/components/polls/duration-selector.tsx +++ b/packages/pl-fe/src/features/compose/components/polls/duration-selector.tsx @@ -11,16 +11,17 @@ const messages = defineMessages({ interface IDurationSelector { onDurationChange(expiresIn: number): void; + value: number; } -const DurationSelector = ({ onDurationChange }: IDurationSelector) => { +const DurationSelector = ({ onDurationChange, value }: IDurationSelector) => { const intl = useIntl(); - const [days, setDays] = useState(2); - const [hours, setHours] = useState(0); - const [minutes, setMinutes] = useState(0); + const [days, setDays] = useState(Math.floor(value / (24 * 60 * 60))); + const [hours, setHours] = useState(Math.floor((value % (24 * 60 * 60)) / (60 * 60))); + const [minutes, setMinutes] = useState(Math.floor((value % (60 * 60)) / 60)); - const value = (days * 24 * 60 * 60) + (hours * 60 * 60) + (minutes * 60); + const newValue = (days * 24 * 60 * 60) + (hours * 60 * 60) + (minutes * 60); useEffect(() => { if (days === 7) { @@ -30,8 +31,8 @@ const DurationSelector = ({ onDurationChange }: IDurationSelector) => { }, [days]); useEffect(() => { - onDurationChange(value); - }, [value]); + onDurationChange(newValue); + }, [newValue]); return (
diff --git a/packages/pl-fe/src/features/compose/components/polls/poll-form.tsx b/packages/pl-fe/src/features/compose/components/polls/poll-form.tsx index f2247bd43..e34989a9f 100644 --- a/packages/pl-fe/src/features/compose/components/polls/poll-form.tsx +++ b/packages/pl-fe/src/features/compose/components/polls/poll-form.tsx @@ -203,7 +203,7 @@ const PollForm: React.FC = ({ composeId }) => { {intl.formatMessage(messages.pollDuration)} - + {/* Remove Poll */} diff --git a/packages/pl-fe/src/features/ui/components/modals/mute-modal.tsx b/packages/pl-fe/src/features/ui/components/modals/mute-modal.tsx index 6106a5161..9e0c66a73 100644 --- a/packages/pl-fe/src/features/ui/components/modals/mute-modal.tsx +++ b/packages/pl-fe/src/features/ui/components/modals/mute-modal.tsx @@ -108,7 +108,7 @@ const MuteModal: React.FC = ({ accountId, onClo : - + )}