replace even mooooore NumberInput with HugeDecimalInput

DA0-DA0 · Oct 2, 2024 · 7fbf3ec · 7fbf3ec
1 parent 78048ae
commit 7fbf3ec
Show file tree

Hide file tree

Showing 64 changed files with 620 additions and 728 deletions.
diff --git a/packages/math/HugeDecimal.ts b/packages/math/HugeDecimal.ts
@@ -112,8 +112,20 @@ export class HugeDecimal {
     return this.value.toJSON()
   }
 
-  toNumber() {
-    return this.value.toNumber()
+  /**
+   * Returns the value of this HugeDecimal instance as a JavaScript primitive
+   * number.
+   *
+   * Pass `truncateDecimals` to truncate to a specific number of decimal places.
+   * Leaving it undefined will preserve all existing decimal places.
+   *
+   * @param truncateDecimals whether or not to truncate the decimal places
+   * @returns a number
+   */
+  toNumber(truncateDecimals?: number) {
+    return truncateDecimals !== undefined
+      ? Number(this.toFixed(truncateDecimals))
+      : this.value.toNumber()
   }
 
   /**
@@ -171,6 +183,10 @@ export class HugeDecimal {
     return this.value.isZero()
   }
 
+  isNaN() {
+    return this.value.isNaN()
+  }
+
   lt(n: HugeDecimal.Value) {
     return this.value.lt(valueToBigNumber(n))
   }

diff --git a/packages/stateful/actions/core/actions/AuthzGrantRevoke/Component.tsx b/packages/stateful/actions/core/actions/AuthzGrantRevoke/Component.tsx
@@ -255,7 +255,7 @@ export const AuthzGrantRevokeComponent: ActionComponent<
               className="mt-2 self-start"
               onClick={() =>
                 appendCoin({
-                  amount: 1,
+                  amount: '1',
                   denom: nativeToken.denomOrAddress,
                   decimals: nativeToken.decimals,
                 })
@@ -467,7 +467,7 @@ export const AuthzGrantRevokeComponent: ActionComponent<
                     className="mt-2 self-start"
                     onClick={() =>
                       appendCoin({
-                        amount: 1,
+                        amount: '1',
                         denom: nativeToken.denomOrAddress,
                         decimals: nativeToken.decimals,
                       })

diff --git a/packages/stateful/actions/core/actions/AuthzGrantRevoke/index.tsx b/packages/stateful/actions/core/actions/AuthzGrantRevoke/index.tsx
@@ -161,10 +161,9 @@ export class AuthzGrantRevokeAction extends ActionBase<AuthzGrantRevokeData> {
       callsRemaining: BigInt(calls),
       // MaxFundsLimit
       // CombinedLimit
-      amounts: funds.map(({ denom, amount, decimals }) => ({
-        amount: HugeDecimal.fromHumanReadable(amount, decimals).toString(),
-        denom,
-      })),
+      amounts: funds.map(({ denom, amount, decimals }) =>
+        HugeDecimal.fromHumanReadable(amount, decimals).toCoin(denom)
+      ),
     })
 
     let authorization: Any | undefined
@@ -381,7 +380,7 @@ export class AuthzGrantRevokeAction extends ActionBase<AuthzGrantRevokeData> {
                 return {
                   denom,
                   amount:
-                    HugeDecimal.from(amount).toHumanReadableNumber(decimals),
+                    HugeDecimal.from(amount).toHumanReadableString(decimals),
                   decimals,
                 }
               }) ?? [],
@@ -422,7 +421,7 @@ export class AuthzGrantRevokeAction extends ActionBase<AuthzGrantRevokeData> {
                 return {
                   denom,
                   amount:
-                    HugeDecimal.from(amount).toHumanReadableNumber(decimals),
+                    HugeDecimal.from(amount).toHumanReadableString(decimals),
                   decimals,
                 }
               }) ?? [],

diff --git a/packages/stateful/actions/core/actions/AuthzGrantRevoke/types.ts b/packages/stateful/actions/core/actions/AuthzGrantRevoke/types.ts
@@ -33,7 +33,7 @@ export type AuthzGrantRevokeData = {
   contract: string
   funds: {
     denom: string
-    amount: number
+    amount: string
     // Will multiply `amount` by 10^decimals when generating the message.
     decimals: number
   }[]

diff --git a/packages/stateful/actions/core/actions/CommunityPoolDeposit/Component.tsx b/packages/stateful/actions/core/actions/CommunityPoolDeposit/Component.tsx
@@ -12,7 +12,7 @@ import { ActionComponent } from '@dao-dao/types/actions'
 
 export type CommunityPoolDepositData = {
   chainId: string
-  amount: number
+  amount: string
   denom: string
   _error?: string
 }
@@ -26,7 +26,7 @@ export const CommunityPoolDepositComponent: ActionComponent<
 > = ({ fieldNamePrefix, isCreating, errors, options: { tokens } }) => {
   const { t } = useTranslation()
 
-  const { register, watch, setValue } =
+  const { register, watch, setValue, getValues } =
     useFormContext<CommunityPoolDepositData>()
 
   const spendChainId = watch((fieldNamePrefix + 'chainId') as 'chainId')
@@ -40,9 +40,7 @@ export const CommunityPoolDepositComponent: ActionComponent<
           token.chainId === spendChainId && token.denomOrAddress === spendDenom
       )
   const selectedDecimals = selectedToken?.token.decimals ?? 0
-  const selectedBalance = HugeDecimal.from(
-    selectedToken?.balance ?? 0
-  ).toHumanReadableNumber(selectedDecimals)
+  const selectedBalance = HugeDecimal.from(selectedToken?.balance ?? 0)
 
   // A warning if the denom was not found in the treasury or the amount is too
   // high. We don't want to make this an error because often people want to
@@ -53,10 +51,10 @@ export const CommunityPoolDepositComponent: ActionComponent<
       ? undefined
       : !selectedToken
       ? t('error.unknownDenom', { denom: spendDenom })
-      : spendAmount > selectedBalance
+      : selectedBalance.toHumanReadable(selectedDecimals).lt(spendAmount)
       ? t('error.insufficientFundsWarning', {
-          amount: selectedBalance.toLocaleString(undefined, {
-            maximumFractionDigits: selectedDecimals,
+          amount: selectedBalance.toInternationalizedHumanReadableString({
+            decimals: selectedDecimals,
           }),
           tokenSymbol: symbol,
         })
@@ -69,6 +67,7 @@ export const CommunityPoolDepositComponent: ActionComponent<
           amount={{
             watch,
             setValue,
+            getValues,
             register,
             fieldName: (fieldNamePrefix + 'amount') as 'amount',
             error: errors?.amount,
@@ -91,11 +90,11 @@ export const CommunityPoolDepositComponent: ActionComponent<
                     description:
                       t('title.balance') +
                       ': ' +
-                      HugeDecimal.from(balance)
-                        .toHumanReadableNumber(token.decimals)
-                        .toLocaleString(undefined, {
-                          maximumFractionDigits: token.decimals,
-                        }),
+                      HugeDecimal.from(
+                        balance
+                      ).toInternationalizedHumanReadableString({
+                        decimals: token.decimals,
+                      }),
                   })),
                 }
           }

diff --git a/packages/stateful/actions/core/actions/CommunityPoolDeposit/index.tsx b/packages/stateful/actions/core/actions/CommunityPoolDeposit/index.tsx
@@ -1,4 +1,3 @@
-import { coins } from '@cosmjs/stargate'
 import { useFormContext } from 'react-hook-form'
 
 import { HugeDecimal } from '@dao-dao/math'
@@ -84,7 +83,7 @@ export class CommunityPoolDepositAction extends ActionBase<CommunityPoolDepositD
 
     this.defaults = {
       chainId: options.chain.chain_id,
-      amount: 100,
+      amount: '100',
       denom: options.chainContext.nativeToken?.denomOrAddress || '',
     }
   }
@@ -115,10 +114,10 @@ export class CommunityPoolDepositAction extends ActionBase<CommunityPoolDepositD
           typeUrl: MsgFundCommunityPool.typeUrl,
           value: MsgFundCommunityPool.fromPartial({
             depositor,
-            amount: coins(
-              HugeDecimal.fromHumanReadable(amount, token.decimals).toString(),
-              denom
-            ),
+            amount: HugeDecimal.fromHumanReadable(
+              amount,
+              token.decimals
+            ).toCoins(denom),
           }),
         },
       })
@@ -154,7 +153,7 @@ export class CommunityPoolDepositAction extends ActionBase<CommunityPoolDepositD
 
     return {
       chainId,
-      amount: HugeDecimal.from(amount).toHumanReadableNumber(decimals),
+      amount: HugeDecimal.from(amount).toHumanReadableString(decimals),
       denom,
     }
   }

diff --git a/packages/stateful/actions/core/actions/ConfigureRebalancer/Component.tsx b/packages/stateful/actions/core/actions/ConfigureRebalancer/Component.tsx
@@ -90,7 +90,7 @@ export type ConfigureRebalancerData = {
   maxLimit?: number
   minBalance?: {
     denom: string
-    amount: number
+    amount: string
   }
   targetOverrideStrategy: TargetOverrideStrategy
 }
@@ -237,10 +237,12 @@ export const ConfigureRebalancerComponent: ActionComponent<
                   amount={{
                     watch,
                     setValue,
+                    getValues,
                     register,
                     fieldName: (fieldNamePrefix +
                       `tokens.${index}.percent`) as `tokens.${number}.percent`,
                     error: errors?.tokens?.[index]?.percent,
+                    numericValue: true,
                     min: 0.01,
                     max: 100,
                     step: 0.01,
@@ -339,7 +341,7 @@ export const ConfigureRebalancerComponent: ActionComponent<
                     ? undefined
                     : {
                         denom: tokens[0]?.denom ?? '',
-                        amount: 1,
+                        amount: '1',
                       }
                 )
               }
@@ -357,6 +359,7 @@ export const ConfigureRebalancerComponent: ActionComponent<
               amount={{
                 watch,
                 setValue,
+                getValues,
                 register,
                 fieldName: (fieldNamePrefix +
                   'minBalance.amount') as 'minBalance.amount',

diff --git a/packages/stateful/actions/core/actions/ConfigureRebalancer/README.md b/packages/stateful/actions/core/actions/ConfigureRebalancer/README.md
@@ -16,7 +16,26 @@ guide](https://github.com/DA0-DA0/dao-dao-ui/wiki/Bulk-importing-actions).
 ```json
 {
   "chainId": "<CHAIN ID>",
-  ...
+  "trustee": "<TRUSTEE ADDRESS>",
+  "baseDenom": "<BASE DENOM>",
+  "tokens": [
+    {
+      "denom": "<DENOM>",
+      "percent": <PERCENT>
+    },
+    ...
+  ],
+  "pid": {
+    "kp": <KP>,
+    "ki": <KI>,
+    "kd": <KD>
+  },
+  "maxLimit": <MAX LIMIT>,
+  "minBalance": {
+    "denom": "<DENOM>",
+    "amount": "<AMOUNT>"
+  } | undefined,
+  "targetOverrideStrategy": "<proportional | priority>"
 }
 ```
 

diff --git a/packages/stateful/actions/core/actions/ConfigureRebalancer/index.tsx b/packages/stateful/actions/core/actions/ConfigureRebalancer/index.tsx
@@ -418,7 +418,7 @@ export class ConfigureRebalancerAction extends ActionBase<ConfigureRebalancerDat
               denom: minBalanceTarget.denom,
               amount: HugeDecimal.from(
                 minBalanceTarget.min_balance
-              ).toHumanReadableNumber(minBalanceToken.decimals),
+              ).toHumanReadableString(minBalanceToken.decimals),
             }
           : undefined,
       targetOverrideStrategy:
@@ -682,7 +682,7 @@ export class ConfigureRebalancerAction extends ActionBase<ConfigureRebalancerDat
               denom: minBalanceTarget.denom,
               amount: HugeDecimal.from(
                 minBalanceTarget.min_balance
-              ).toHumanReadableNumber(minBalanceToken.decimals),
+              ).toHumanReadableString(minBalanceToken.decimals),
             }
           : undefined,
       targetOverrideStrategy: data.target_override_strategy || 'proportional',

diff --git a/packages/stateful/actions/core/actions/CreateRewardDistribution/index.tsx b/packages/stateful/actions/core/actions/CreateRewardDistribution/index.tsx
@@ -619,6 +619,7 @@ export class CreateRewardDistributionAction extends ActionBase<CreateRewardDistr
   }: any): CreateRewardDistributionData {
     return {
       ...data,
+      // Ensure initialFunds is a string.
       initialFunds: HugeDecimal.from(initialFunds).toString(),
     }
   }

diff --git a/packages/stateful/actions/core/actions/CreateValenceAccount/Component.tsx b/packages/stateful/actions/core/actions/CreateValenceAccount/Component.tsx
@@ -24,7 +24,7 @@ export type CreateValenceAccountData = {
   chainId: string
   funds: {
     denom: string
-    amount: number
+    amount: string
     // Will multiply `amount` by 10^decimals when generating the message.
     decimals: number
   }[]
@@ -133,7 +133,7 @@ export const CreateValenceAccountComponent: ActionComponent<
               className="self-start"
               onClick={() =>
                 appendCoin({
-                  amount: 1,
+                  amount: '1',
                   denom: nativeToken.denomOrAddress,
                   decimals: nativeToken.decimals,
                 })

diff --git a/packages/stateful/actions/core/actions/CreateValenceAccount/index.tsx b/packages/stateful/actions/core/actions/CreateValenceAccount/index.tsx
@@ -163,7 +163,7 @@ export class CreateValenceAccountAction extends ActionBase<CreateValenceAccountD
     funds: [
       {
         denom: 'untrn',
-        amount: 10,
+        amount: '10',
         decimals: 6,
       },
     ],
@@ -199,18 +199,17 @@ export class CreateValenceAccountAction extends ActionBase<CreateValenceAccountD
       )
     }
 
-    const convertedFunds = funds.map(({ denom, amount, decimals }) => ({
-      denom,
-      amount: HugeDecimal.fromHumanReadable(amount, decimals).toString(),
-    }))
+    const convertedFunds = funds.map(({ denom, amount, decimals }) =>
+      HugeDecimal.fromHumanReadable(amount, decimals).toCoin(denom)
+    )
 
     // Add service fee to funds.
     if (serviceFee && serviceFee.amount !== '0') {
       const existing = convertedFunds.find((f) => f.denom === serviceFee.denom)
       if (existing) {
-        existing.amount = (
-          BigInt(existing.amount) + BigInt(serviceFee.amount)
-        ).toString()
+        existing.amount = HugeDecimal.from(existing.amount)
+          .plus(serviceFee.amount)
+          .toString()
       } else {
         convertedFunds.push({
           denom: serviceFee.denom,
@@ -279,7 +278,7 @@ export class CreateValenceAccountAction extends ActionBase<CreateValenceAccountD
 
           return {
             denom,
-            amount: HugeDecimal.from(amount).toHumanReadableNumber(
+            amount: HugeDecimal.from(amount).toHumanReadableString(
               token.decimals
             ),
             decimals: token.decimals,

diff --git a/packages/stateful/actions/core/actions/Execute/Component.tsx b/packages/stateful/actions/core/actions/Execute/Component.tsx
@@ -34,7 +34,7 @@ export type ExecuteData = {
   message: string
   funds: {
     denom: string
-    amount: number
+    amount: string
     // Will multiply `amount` by 10^decimals when generating the message.
     decimals: number
   }[]
@@ -58,7 +58,7 @@ export const ExecuteComponent: ActionComponent<ExecuteOptions> = ({
   const { context } = useActionOptions()
   const { chain_id: chainId, bech32_prefix: bech32Prefix } = useChain()
 
-  const { register, control, watch, setValue } = useFormContext()
+  const { register, control, watch, setValue, getValues } = useFormContext()
   const {
     fields: coins,
     append: appendCoin,
@@ -192,6 +192,7 @@ export const ExecuteComponent: ActionComponent<ExecuteOptions> = ({
                 amount={{
                   watch,
                   setValue,
+                  getValues,
                   register,
                   fieldName: fieldNamePrefix + 'funds.0.amount',
                   error: errors?.funds?.[0]?.amount,