feat(buy): min/max credit card fix

blockchain · May 27, 2021 · 54f7287 · 54f7287
1 parent 53cfebe
commit 54f7287
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/...es/blockchain-wallet-v4-frontend/src/modals/SimpleBuy/EnterAmount/Checkout/validation.tsx b/...es/blockchain-wallet-v4-frontend/src/modals/SimpleBuy/EnterAmount/Checkout/validation.tsx
@@ -134,8 +134,10 @@ export const getMaxMin = (
           let limitMaxAmount = Number(pair.buyMax)
           let limitMaxChanged = false
           if (limits?.maxOrder) {
-            const buyMaxItem = Number(convertBaseToStandard('FIAT', limitMaxAmount))
-            const baseMaxLimitAmount = Number(limits.maxOrder)
+            const buyMaxItem = Number(limitMaxAmount)
+            const maxOrderBase = convertBaseToStandard('FIAT', limits.maxOrder, false)
+
+            const baseMaxLimitAmount = Number(maxOrderBase)
             if (baseMaxLimitAmount < buyMaxItem && !isSddFlow) {
               limitMaxAmount = baseMaxLimitAmount
               limitMaxChanged = true
@@ -156,8 +158,11 @@ export const getMaxMin = (
               : convertBaseToStandard('FIAT', pair.buyMax)
           }
 
-          if (Number(defaultMax.FIAT) > limitMaxAmount && limitMaxChanged) {
-            defaultMax.FIAT = String(limitMaxAmount)
+          const defaultMaxCompare = limitMaxChanged
+            ? Number(convertBaseToStandard('FIAT', limitMaxAmount))
+            : limitMaxAmount
+          if (Number(defaultMax.FIAT) > defaultMaxCompare && limitMaxChanged) {
+            defaultMax.FIAT = String(defaultMaxCompare)
           }
 
           if (!allValues) return defaultMax
@@ -192,8 +197,7 @@ export const getMaxMin = (
             }
           }
 
-          const maxFiat =
-            !fundsChangedMax && !limitMaxChanged ? convertBaseToStandard('FIAT', max) : max
+          const maxFiat = !fundsChangedMax ? convertBaseToStandard('FIAT', max) : max
           const maxCrypto = getQuote(quote.pair, quote.rate, 'FIAT', maxFiat)
 
           return { CRYPTO: maxCrypto, FIAT: maxFiat }
@@ -202,10 +206,9 @@ export const getMaxMin = (
           let limitMinAmount = Number(pair.buyMin)
           let limitMinChanged = false
           if (limits?.minOrder) {
-            const buyMinItem = Number(convertBaseToStandard('FIAT', limitMinAmount))
-            const baseMinLimitAmount = Number(limits.minOrder)
-
-            if (baseMinLimitAmount > buyMinItem && !isSddFlow) {
+            const minOrderBase = convertBaseToStandard('FIAT', limits.minOrder, false)
+            const baseMinLimitAmount = Number(minOrderBase)
+            if (baseMinLimitAmount > limitMinAmount && !isSddFlow) {
               limitMinAmount = baseMinLimitAmount
               limitMinChanged = true
             }
@@ -225,8 +228,11 @@ export const getMaxMin = (
               : convertBaseToStandard('FIAT', pair.buyMin)
           }
 
-          if (Number(defaultMin.FIAT) < limitMinAmount && limitMinChanged) {
-            defaultMin.FIAT = String(limitMinAmount)
+          const defaultMinCompare = limitMinChanged
+            ? Number(convertBaseToStandard('FIAT', limitMinAmount))
+            : limitMinAmount
+          if (Number(defaultMin.FIAT) < defaultMinCompare && limitMinChanged) {
+            defaultMin.FIAT = String(defaultMinCompare)
           }
 
           if (!allValues) return defaultMin