From 54c412d2c395cb0854c8723a6fcfd09bef95785b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicole=20Miko=C5=82ajczyk?= <git@mkljczk.pl>
Date: Wed, 30 Apr 2025 14:51:17 +0200
Subject: [PATCH] pl-fe: restore state correctly in durationselector
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nicole Mikołajczyk <git@mkljczk.pl>
---
 .../components/polls/duration-selector.tsx        | 15 ++++++++-------
 .../compose/components/polls/poll-form.tsx        |  2 +-
 .../features/ui/components/modals/mute-modal.tsx  |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

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<number>(2);
-  const [hours, setHours] = useState<number>(0);
-  const [minutes, setMinutes] = useState<number>(0);
+  const [days, setDays] = useState<number>(Math.floor(value / (24 * 60 * 60)));
+  const [hours, setHours] = useState<number>(Math.floor((value % (24 * 60 * 60)) / (60 * 60)));
+  const [minutes, setMinutes] = useState<number>(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 (
     <div className='grid grid-cols-1 gap-2 sm:grid-cols-3'>
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<IPollForm> = ({ composeId }) => {
           {intl.formatMessage(messages.pollDuration)}
         </Text>
 
-        <DurationSelector onDurationChange={handleSelectDuration} />
+        <DurationSelector onDurationChange={handleSelectDuration} value={expiresIn || (2 * 24 * 60 * 60)} />
       </Stack>
 
       {/* 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<MuteModalProps & BaseModalProps> = ({ accountId, onClo
               <Stack space={2}>
                 <Text weight='medium'><FormattedMessage id='mute_modal.duration' defaultMessage='Duration' />: </Text>
 
-                <DurationSelector onDurationChange={handleChangeMuteDuration} />
+                <DurationSelector onDurationChange={handleChangeMuteDuration} value={duration} />
               </Stack>
             )}
           </>