GIX-1890: Apply new minimum

dfinity · Sep 19, 2023 · 2b74a21 · 2b74a21
1 parent 27e9fd0
commit 2b74a21
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/frontend/src/lib/components/sns-neuron-detail/actions/SnsDisburseMaturityButton.svelte b/frontend/src/lib/components/sns-neuron-detail/actions/SnsDisburseMaturityButton.svelte
@@ -1,5 +1,8 @@
 <script lang="ts">
-  import { hasEnoughMaturityToDisburse } from "$lib/utils/sns-neuron.utils";
+  import {
+    hasEnoughMaturityToDisburse,
+    minimumAmountToDisburseMaturity,
+  } from "$lib/utils/sns-neuron.utils";
   import { openSnsNeuronModal } from "$lib/utils/modals.utils";
   import type { SnsNeuron } from "@dfinity/sns";
   import DisburseMaturityButton from "$lib/components/neuron-detail/actions/DisburseMaturityButton.svelte";
@@ -17,7 +20,9 @@
   $: disabledText = !enoughMaturity
     ? replacePlaceholders(
         $i18n.neuron_detail.disburse_maturity_disabled_tooltip,
-        { $fee: formatToken({ value: feeE8s }) }
+        {
+          $fee: formatToken({ value: minimumAmountToDisburseMaturity(feeE8s) }),
+        }
       )
     : undefined;
 

diff --git a/frontend/src/lib/modals/neurons/DisburseMaturityModal.svelte b/frontend/src/lib/modals/neurons/DisburseMaturityModal.svelte
@@ -47,8 +47,8 @@
   $: disabledText =
     disableDisburse && percentageToDisburse > 0
       ? replacePlaceholders(
-          $i18n.neuron_detail.disburse_maturity_modal_disabled_tooltip,
-          { $amount: formatToken({ value: minimumAmountE8s }) }
+          $i18n.neuron_detail.disburse_maturity_disabled_tooltip,
+          { $fee: formatToken({ value: minimumAmountE8s }) }
         )
       : undefined;
 

diff --git a/frontend/src/lib/utils/sns-neuron.utils.ts b/frontend/src/lib/utils/sns-neuron.utils.ts
@@ -506,7 +506,7 @@ export const hasEnoughMaturityToStake = (
 ): boolean => (neuron?.maturity_e8s_equivalent ?? BigInt(0)) > BigInt(0);
 
 /**
- * Is the maturity of the neuron bigger than the transaction fee?
+ * Is the maturity of the neuron bigger than the minimum amount to disburse?
  * @param {SnsNeuron} neuron
  * @param {bigint} feeE8s
  */
@@ -516,7 +516,8 @@ export const hasEnoughMaturityToDisburse = ({
 }: {
   feeE8s: bigint;
   neuron: SnsNeuron;
-}): boolean => maturity_e8s_equivalent >= feeE8s;
+}): boolean =>
+  maturity_e8s_equivalent >= minimumAmountToDisburseMaturity(feeE8s);
 
 /**
  * Does the neuron has staked maturity?

diff --git a/...tend/src/tests/lib/components/sns-neuron-detail/actions/SnsDisburseMaturityButton.spec.ts b/...tend/src/tests/lib/components/sns-neuron-detail/actions/SnsDisburseMaturityButton.spec.ts
@@ -29,7 +29,7 @@ describe("SnsDisburseMaturityButton", () => {
     const po = renderComponent(
       {
         ...mockSnsNeuron,
-        maturity_e8s_equivalent: fee + 10n,
+        maturity_e8s_equivalent: fee * 2n,
         staked_maturity_e8s_equivalent: [],
       },
       fee
@@ -50,7 +50,7 @@ describe("SnsDisburseMaturityButton", () => {
 
     expect(await po.isDisabled()).toBe(true);
     expect(await po.getTooltipText()).toBe(
-      "You do not have enough maturity to disburse. The minimum is: 0.0001."
+      "You do not have enough maturity to disburse. The minimum is: 0.00010526."
     );
   });
 

diff --git a/frontend/src/tests/lib/utils/sns-neuron.utils.spec.ts b/frontend/src/tests/lib/utils/sns-neuron.utils.spec.ts
@@ -1392,10 +1392,10 @@ describe("sns-neuron utils", () => {
 
   describe("hasEnoughMaturityToDisburse", () => {
     const feeE8s = 10_000n;
-    it("should return true if maturity is more than fee", () => {
+    it("should return true if maturity is more than fee in worst modulation scenario", () => {
       const neuron = {
         ...mockSnsNeuron,
-        maturity_e8s_equivalent: feeE8s + 1n,
+        maturity_e8s_equivalent: 10526n + 1n,
       };
       expect(hasEnoughMaturityToDisburse({ neuron, feeE8s })).toBe(true);
     });
@@ -1408,12 +1408,12 @@ describe("sns-neuron utils", () => {
       expect(hasEnoughMaturityToDisburse({ neuron, feeE8s })).toBe(false);
     });
 
-    it("should return true if maturity is same as fee", () => {
+    it("should return false if maturity is same as fee", () => {
       const neuron = {
         ...mockSnsNeuron,
         maturity_e8s_equivalent: feeE8s,
       };
-      expect(hasEnoughMaturityToDisburse({ neuron, feeE8s })).toBe(true);
+      expect(hasEnoughMaturityToDisburse({ neuron, feeE8s })).toBe(false);
     });
   });