Fix: Missing validation (#3096)

* fix: missing fee validation * chore: log
novasamatech · Feb 3, 2025 · 4541076 · 4541076
1 parent 718ca6b
commit 4541076
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/src/renderer/features/operations/OperationsConfirm/Transfer/model/confirm-model.ts b/src/renderer/features/operations/OperationsConfirm/Transfer/model/confirm-model.ts
@@ -178,7 +178,10 @@ const validateFx = createEffect(({ store, balances }: ValidateParams) => {
 
   if (!result) return;
 
-  throw new Error(result.errorText);
+  const error = new Error(result.errorText);
+  console.error(error);
+
+  throw error;
 });
 
 const $initiatorWallets = combine(

diff --git a/src/renderer/features/operations/OperationsValidation/lib/validation/balance.ts b/src/renderer/features/operations/OperationsValidation/lib/validation/balance.ts
@@ -1,4 +1,4 @@
-import { BN } from '@polkadot/util';
+import { BN, BN_ZERO } from '@polkadot/util';
 
 import { ZERO_BALANCE, formatAmount } from '@/shared/lib/utils';
 import { type Config, type TransferFeeStore, type TransferXcmFeeStore } from '../../types/types';
@@ -31,21 +31,17 @@ function insufficientBalanceForFee(
     isNative,
     isProxy,
     isMultisig,
-    isXcm,
   }: TransferFeeStore,
   config: Config = { withFormatAmount: true },
 ) {
-  if (isXcm && !isNative) {
-    if (isLteThanBalance(fee, balance)) {
-      return true;
-    }
+  if (!isNative) {
+    return isLteThanBalance(fee, balance);
   }
 
   const amountBN = new BN(config.withFormatAmount ? formatAmount(amount, asset.precision) : amount);
-  const feeBN = new BN(isProxy || isMultisig ? ZERO_BALANCE : fee);
-  const value = amountBN.add(feeBN);
+  const feeBN = isProxy || isMultisig ? BN_ZERO : new BN(fee);
 
-  return isLteThanBalance(value, balance);
+  return isLteThanBalance(amountBN.add(feeBN), balance);
 }
 
 function insufficientBalanceForXcmFee(

diff --git a/src/renderer/shared/i18n/locales/en.json b/src/renderer/shared/i18n/locales/en.json
@@ -1505,7 +1505,7 @@
     },
     "notEnoughBalanceError": "Not enough funds to complete operation",
     "notEnoughBalanceForDepositError": "Insufficient balance to pay deposit and network fee",
-    "notEnoughBalanceForFeeError": "Insufficient balance to pay network fee",
+    "notEnoughBalanceForFeeError": "Not enough tokens to pay for the network fee",
     "notEnoughStakedError": "Not enough staked to unstake specific amount",
     "notEnoughUnlockingError": "Not enough unlocking to return specific amount",
     "overview": {
@@ -1650,7 +1650,7 @@
     "noAmount": "Please provide amount",
     "notEnoughBalanceError": "Not enough funds to transfer specific amount",
     "notEnoughBalanceForDepositError": "Insufficient balance to pay deposit and network fee",
-    "notEnoughBalanceForFeeError": "Insufficient balance to pay network fee",
+    "notEnoughBalanceForFeeError": "Not enough tokens to pay for the network fee",
     "notZeroAmountError": "Value cannot be zero",
     "onChainPlaceholder": "On-chain",
     "pasteButton": "Paste",

diff --git a/src/renderer/widgets/Transfer/model/form-model.ts b/src/renderer/widgets/Transfer/model/form-model.ts
@@ -163,6 +163,18 @@ const $transferForm = createForm<FormParams>({
             balance: $accountBalance,
           }),
         ),
+        TransferRules.amount.insufficientBalanceForFee(
+          combine({
+            fee: $totalFee,
+            xcmFee: xcmTransferModel.$xcmFee,
+            network: $networkStore,
+            balance: $accountBalance,
+            isNative: $isNative,
+            isMultisig: $isMultisig,
+            isXcm: $isXcm,
+            isProxy: $isProxy,
+          }),
+        ),
         TransferRules.amount.insufficientBalanceForXcmFee(
           combine({
             fee: $totalFee,