feat: subtract pending fees from available balance in stx send form

leather-io · Apr 12, 2023 · a894886 · a894886
1 parent 31acf9b
commit a894886
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/app/common/money/format-money.ts b/src/app/common/money/format-money.ts
@@ -27,3 +27,8 @@ export function i18nFormatCurrency(quantity: Money, locale = 'en-US') {
 export function formatDustUsdAmounts(value: string) {
   return value.endsWith('0.00') ? '<' + thinSpace + value.replace('0.00', '0.01') : value;
 }
+
+export function subtractMoney(xAmount: Money, yAmount: Money) {
+  if (xAmount.symbol !== yAmount.symbol) throw new Error('Cannot subtract different currencies');
+  return xAmount.amount.minus(yAmount.amount);
+}
diff --git a/src/app/common/validation/forms/amount-validators.ts b/src/app/common/validation/forms/amount-validators.ts
@@ -4,6 +4,7 @@ import * as yup from 'yup';
 import { Money } from '@shared/models/money.model';
 import { isNumber } from '@shared/utils';
 
+import { subtractMoney } from '@app/common/money/format-money';
 import {
   btcToSat,
   microStxToStx,
@@ -79,19 +80,21 @@ export function stxAmountValidator() {
     .concat(stxAmountPrecisionValidator(formatPrecisionError()));
 }
 
-export function stxAvailableBalanceValidator(availableBalance: Money) {
+export function stxAvailableBalanceValidator(availableBalance: Money, pendingTxsBalance: Money) {
   return yup
     .number()
     .typeError(formatErrorWithSymbol('STX', FormErrorMessages.MustBeNumber))
     .test({
       message: formatInsufficientBalanceError(availableBalance, sum =>
-        microStxToStx(sum.amount).toString()
+        microStxToStx(subtractMoney(sum, pendingTxsBalance)).toString()
       ),
       test(value: unknown) {
         const fee = stxToMicroStx(this.parent.fee);
         if (!availableBalance || !isNumber(value)) return false;
-        const availableBalanceLessFee = availableBalance.amount.minus(fee);
-        return availableBalanceLessFee.isGreaterThanOrEqualTo(stxToMicroStx(value));
+        const availableBalanceLessAll = subtractMoney(availableBalance, pendingTxsBalance).minus(
+          fee
+        );
+        return availableBalanceLessAll.isGreaterThanOrEqualTo(stxToMicroStx(value));
       },
     });
 }

diff --git a/src/app/pages/send/send-crypto-asset-form/form/stx/use-stx-send-form.tsx b/src/app/pages/send/send-crypto-asset-form/form/stx/use-stx-send-form.tsx
@@ -67,7 +67,9 @@ export function useStxSendForm() {
     stxFees,
 
     validationSchema: yup.object({
-      amount: stxAmountValidator().concat(stxAvailableBalanceValidator(availableStxBalance)),
+      amount: stxAmountValidator().concat(
+        stxAvailableBalanceValidator(availableStxBalance, pendingTxsBalance)
+      ),
       fee: stxFeeValidator(availableStxBalance),
       recipient,
       memo,