fix: spending limit validation (#1681)

safe-global · Feb 20, 2023 · f3fb93c · f3fb93c
1 parent 14271ec
commit f3fb93c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/components/tx/SpendingLimitRow/index.tsx b/src/components/tx/SpendingLimitRow/index.tsx
@@ -13,7 +13,7 @@ const SpendingLimitRow = ({
   availableAmount: BigNumber
   selectedToken: TokenInfo | undefined
 }) => {
-  const { control } = useFormContext()
+  const { control, trigger } = useFormContext()
   const isOnlySpendLimitBeneficiary = useIsOnlySpendingLimitBeneficiary()
 
   const formattedAmount = safeFormatUnits(availableAmount, selectedToken?.decimals)
@@ -26,8 +26,16 @@ const SpendingLimitRow = ({
           rules={{ required: true }}
           control={control}
           name={SendAssetsField.type}
-          render={({ field }) => (
-            <RadioGroup {...field} defaultValue={SendTxType.multiSig}>
+          render={({ field: { onChange, ...field } }) => (
+            <RadioGroup
+              onChange={async (e) => {
+                // Validate only after the field is changed
+                await onChange(e)
+                trigger(SendAssetsField.amount)
+              }}
+              {...field}
+              defaultValue={SendTxType.multiSig}
+            >
               {!isOnlySpendLimitBeneficiary && (
                 <FormControlLabel
                   value={SendTxType.multiSig}

diff --git a/src/components/tx/modals/TokenTransferModal/SendAssetsForm.tsx b/src/components/tx/modals/TokenTransferModal/SendAssetsForm.tsx
@@ -129,8 +129,8 @@ const SendAssetsForm = ({
   const isSpendingLimitType = type === SendTxType.spendingLimit
   const spendingLimitAmount = spendingLimit ? BigNumber.from(spendingLimit.amount).sub(spendingLimit.spent) : undefined
   const totalAmount = BigNumber.from(selectedToken?.balance || 0)
-  const maxAmount = spendingLimitAmount
-    ? totalAmount.gt(spendingLimitAmount)
+  const maxAmount = isSpendingLimitType
+    ? spendingLimitAmount && totalAmount.gt(spendingLimitAmount)
       ? spendingLimitAmount
       : totalAmount
     : totalAmount