[14/04 16:05 - feature/mission-70]: WIP - Work in progress!

Author: 0xFFrancesco

src/governance-app-frontend/src/features/stakes/components/neuronDetail/NeuronDetailIncreaseDelayView.tsx

@@ -7,9 +7,8 @@ import { Alert, AlertDescription } from '@components/Alert';
 import { Button } from '@components/button';
 import { MaxRewardsBadge } from '@components/MaxRewardsBadge';
 import { SECONDS_IN_MONTH } from '@constants/extra';
-import { ICP_MAX_DISSOLVE_DELAY_MONTHS } from '@constants/neuron';
 import { mapCanisterError } from '@utils/errors';
-import { getNeuronDissolveDelaySeconds } from '@utils/neuron';
+import { getNeuronDissolveDelaySeconds, getNeuronIsMaxDissolveDelay } from '@utils/neuron';
 import { errorNotification, successNotification } from '@utils/notification';
 
 import { useIncreaseDelay } from '../../hooks/useIncreaseDelay';
@@ -34,11 +33,8 @@ export function NeuronDetailIncreaseDelayView({
 
   const { mutateAsync, isPending } = useIncreaseDelay();
 
-  // Get current dissolve delay in months
   const currentDelaySeconds = Number(getNeuronDissolveDelaySeconds(neuron));
-  const currentDelayMonths = Math.round(currentDelaySeconds / SECONDS_IN_MONTH);
-
-  const isMaxDelay = currentDelayMonths >= ICP_MAX_DISSOLVE_DELAY_MONTHS;
+  const isMaxDelay = getNeuronIsMaxDissolveDelay(neuron);
 
   const handleConfirm = async () => {
     if (!selectedMonths) return;
@@ -49,6 +45,7 @@ export function NeuronDetailIncreaseDelayView({
       await mutateAsync({
         neuronId: neuron.neuronId,
         dissolveDelayMonths: selectedMonths,
+        currentDissolveDelaySeconds: currentDelaySeconds,
       });
 
       successNotification({
@@ -101,7 +98,7 @@ export function NeuronDetailIncreaseDelayView({
         <div className="mb-2 grid grid-cols-1 gap-2 sm:grid-cols-2">
           {regularOptions.map((option) => {
             const isSelected = selectedMonths === option.value;
-            const isDisabled = option.value <= currentDelayMonths;
+            const isDisabled = option.value * SECONDS_IN_MONTH <= currentDelaySeconds;
 
             return (
               <button
@@ -128,7 +125,7 @@ export function NeuronDetailIncreaseDelayView({
         {/* Max rewards option */}
         {(() => {
           const isSelected = selectedMonths === maxRewardsOption.value;
-          const isDisabled = maxRewardsOption.value === currentDelayMonths;
+          const isDisabled = maxRewardsOption.value * SECONDS_IN_MONTH <= currentDelaySeconds;
 
           return (
             <button

src/governance-app-frontend/src/features/stakes/hooks/useCreateNeuron.ts

@@ -9,7 +9,7 @@ import {
   getConsistentTopicFollowees,
 } from '@features/voting/utils/topicFollowing';
 
-import { E8Sn, ICP_TRANSACTION_FEE_E8Sn, SECONDS_IN_MONTH } from '@constants/extra';
+import { E8Sn, ICP_TRANSACTION_FEE_E8Sn, SECONDS_IN_DAY, SECONDS_IN_MONTH } from '@constants/extra';
 import { useNnsGovernance } from '@hooks/governance';
 import { useIcpLedger } from '@hooks/icpLedger';
 import { bigIntMul } from '@utils/bigInt';
@@ -88,12 +88,13 @@ export function useCreateNeuron(params: Props) {
       }
 
       // Step 2: Set dissolve delay
+      // New neurons start with a default 7-day dissolve delay, so subtract it
       if (step === StakingWizardCreateNeuronStep.SetDissolveDelay) {
-        const newDissolveTimestamp =
-          Math.floor(Date.now() / 1000) + params.dissolveDelayMonths * SECONDS_IN_MONTH;
-        await governanceCanister.setDissolveDelay({
+        const defaultDelay = SECONDS_IN_DAY * 7;
+        const targetDelay = params.dissolveDelayMonths * SECONDS_IN_MONTH;
+        await governanceCanister.increaseDissolveDelay({
           neuronId,
-          dissolveDelaySeconds: newDissolveTimestamp,
+          additionalDissolveDelaySeconds: Math.max(targetDelay - defaultDelay, 0),
         });
         step = StakingWizardCreateNeuronStep.SetAutoStakeMaturity;
         setCurrentStep(step);

src/governance-app-frontend/src/features/stakes/hooks/useIncreaseDelay.ts

@@ -9,6 +9,7 @@ import { failedRefresh, QUERY_KEYS } from '@utils/query';
 type IncreaseDelayParams = {
   neuronId: bigint;
   dissolveDelayMonths: number;
+  currentDissolveDelaySeconds: number;
 };
 
 /**
@@ -27,14 +28,11 @@ export function useIncreaseDelay() {
         throw new Error(t(($) => $.neuronDetailModal.increaseDelay.errors.failed));
       }
 
-      // Calculate the new dissolve delay timestamp
-      // This is the current time + the delay in seconds
-      const newDissolveTimestamp =
-        Math.floor(Date.now() / 1000) + params.dissolveDelayMonths * SECONDS_IN_MONTH;
-
-      await governanceCanister.setDissolveDelay({
+      const targetDelay = params.dissolveDelayMonths * SECONDS_IN_MONTH;
+      const additional = Math.max(targetDelay - params.currentDissolveDelaySeconds, 0);
+      await governanceCanister.increaseDissolveDelay({
         neuronId: params.neuronId,
-        dissolveDelaySeconds: newDissolveTimestamp,
+        additionalDissolveDelaySeconds: additional,
       });
 
       await queryClient