fix(do not block sell after trade)

blockchain · Jun 21, 2018 · a0060cb · a0060cb
1 parent 4cc49dc
commit a0060cb
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 37 deletions.
diff --git a/...chain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/QuoteInputTemplate.js b/...chain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/QuoteInputTemplate.js
@@ -4,7 +4,7 @@ import styled from 'styled-components'
 import { FormattedMessage } from 'react-intl'
 import { NavLink } from 'react-router-dom'
 import { Field, reduxForm } from 'redux-form'
-import { head, equals } from 'ramda'
+import { equals, gt, head, not, prop } from 'ramda'
 
 import { Icon, Link, Text } from 'blockchain-info-components'
 import { SelectBoxCoinifyCurrency, NumberBoxDebounced } from 'components/Form'
@@ -132,7 +132,7 @@ const FiatConvertor = (props) => {
   }
 
   const renderErrorsAndLimits = () => {
-    if (!canTrade) {
+    if (!isSell && !canTrade) {
       return (
         <Error size='13px' weight={300} color='error'>
           { reasonExplanation }
@@ -148,12 +148,12 @@ const FiatConvertor = (props) => {
       return (
         <LimitsHelper>
           {
-            form === 'coinifyCheckoutBuy'
-              ? <FormattedMessage id='buy.quote_input.remaining_buy_limit' defaultMessage='Your remaining buy limit is {max}' values={{ max: <a onClick={() => setMax(limits.max)}>{curr}{limits.max}</a> }} />
-              : getSellLimits()
+            isSell
+              ? getSellLimits()
+              : <FormattedMessage id='buy.quote_input.remaining_buy_limit' defaultMessage='Your remaining buy limit is {max}' values={{ max: <a onClick={() => setMax(limits.max)}>{curr}{limits.max}</a> }} />
           }
           {
-            level.name < 2 && kyc.state !== 'reviewing'
+            gt(2, prop('name', level)) && not(equals(prop('state', kyc), 'reviewing'))
               ? <a onClick={() => increaseLimit()}>
                 <FormattedMessage id='buysell.quote_input.increase_limits' defaultMessage=' Increase your limit.' />
               </a>
@@ -164,7 +164,7 @@ const FiatConvertor = (props) => {
     }
   }
 
-  const inputsDisabled = disabled || !canTrade || equals(checkoutError, 'effective_max_under_min')
+  const inputsDisabled = disabled || (!canTrade && !isSell) || equals(checkoutError, 'effective_max_under_min')
 
   return (
     <Wrapper>

diff --git a/packages/blockchain-wallet-v4-frontend/src/services/CoinifyService/index.js b/packages/blockchain-wallet-v4-frontend/src/services/CoinifyService/index.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { gt, slice, toUpper, equals, path, prop } from 'ramda'
+import { any, gt, slice, toUpper, equals, path, prop, toLower } from 'ramda'
 import { FormattedMessage } from 'react-intl'
 import * as Currency from 'blockchain-wallet-v4/src/exchange/currency'
 
@@ -95,8 +95,11 @@ export const reviewOrder = {
   renderFirstRow: (q, medium) => {
     const qAmt = Math.abs(q.quoteAmount)
     const bAmt = Math.abs(q.baseAmount)
-    if (reviewOrder.baseBtc(q)) return `${bAmt / 1e8} BTC (${currencySymbolMap[q.quoteCurrency]}${qAmt.toFixed(2)})`
-    else return `${qAmt / 1e8} BTC (${currencySymbolMap[q.baseCurrency]}${bAmt.toFixed(2)})`
+    if (reviewOrder.baseBtc(q)) {
+      return `${bAmt / 1e8} BTC (${currencySymbolMap[q.quoteCurrency]}${qAmt.toFixed(2)})`
+    } else {
+      return `${qAmt / 1e8} BTC (${currencySymbolMap[q.baseCurrency]}${bAmt.toFixed(2)})`
+    }
   },
   renderFeeRow: (q, medium, type) => {
     const med = type === 'sell' ? 'bank' : medium
@@ -140,20 +143,24 @@ export const tradeDetails = {
 
 export const getCountryCodeFromIban = (iban) => toUpper(slice(0, 2, iban))
 
-export const canCancelTrade = (trade) => {
-  const { state } = trade
-  if (equals(state, 'awaiting_transfer_in')) return true
-  return false
-}
+export const canCancelTrade = (trade) =>
+  equals(prop('state', trade), 'awaiting_transfer_in')
 
 export const checkoutButtonLimitsHelper = (quoteR, limits, type) => {
   return quoteR.map(q => {
+    const isBaseBtc = equals(prop('baseCurrency', q), 'BTC')
     if (type === 'sell') {
-      if (q.baseCurrency !== 'BTC') return Math.abs(q.quoteAmount / 1e8) > limits.max || Math.abs(q.quoteAmount / 1e8) < limits.min || Math.abs(q.quoteAmount) > limits.effectiveMax
-      if (q.baseCurrency !== 'BTC') return Math.abs(q.baseAmount / 1e8) > limits.max || Math.abs(q.baseAmount / 1e8) < limits.min || Math.abs(q.baseAmount) > limits.effectiveMax
+      if (isBaseBtc) {
+        return Math.abs(q.baseAmount / 1e8) > limits.max || Math.abs(q.baseAmount / 1e8) < limits.min || Math.abs(q.baseAmount) > limits.effectiveMax
+      } else {
+        return Math.abs(q.quoteAmount / 1e8) > limits.max || Math.abs(q.quoteAmount / 1e8) < limits.min || Math.abs(q.quoteAmount) > limits.effectiveMax
+      }
     } else {
-      if (q.baseCurrency !== 'BTC') return Math.abs(q.baseAmount) > limits.max || Math.abs(q.baseAmount) < limits.min || Math.abs(q.quoteAmount) > limits.effectiveMax
-      if (q.baseCurrency === 'BTC') return Math.abs(q.quoteAmount) > limits.max || Math.abs(q.quoteAmount) < limits.min || Math.abs(q.baseAmount) > limits.effectiveMax
+      if (isBaseBtc) {
+        return Math.abs(q.quoteAmount) > limits.max || Math.abs(q.quoteAmount) < limits.min || Math.abs(q.baseAmount) > limits.effectiveMax
+      } else {
+        return Math.abs(q.baseAmount) > limits.max || Math.abs(q.baseAmount) < limits.min || Math.abs(q.quoteAmount) > limits.effectiveMax
+      }
     }
   }).data
 }
@@ -249,16 +256,13 @@ export const kycNotificationButtonHelper = (status) => {
   }
 }
 
-export const showKycStatus = (state) => {
-  if (state === 'pending') return state
-  if (state === 'rejected') return state
-  return false
-}
+export const showKycStatus = (state) =>
+  any(equals(state), ['pending', 'rejected']) ? state : false
 
 export const getReasonExplanation = (reason, time) => {
   const ONE_DAY_MS = 86400000
-  let canTradeAfter = time
-  let days = isNaN(canTradeAfter) ? `1 day` : `${Math.ceil((canTradeAfter - Date.now()) / ONE_DAY_MS)} days`
+  const canTradeAfter = time
+  const days = isNaN(canTradeAfter) ? `1 day` : `${Math.ceil((canTradeAfter - Date.now()) / ONE_DAY_MS)} days`
 
   switch (reason) {
     case 'awaiting_first_trade_completion':
@@ -270,20 +274,26 @@ export const getReasonExplanation = (reason, time) => {
 }
 
 export const recurringTimeHelper = (sub) => {
-  let human = { 1: 'st', 2: 'nd', 3: 'rd', 21: 'st', 22: 'nd', 23: 'rd', 31: 'st' }
-  let days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']
+  const human = { 1: 'st', 2: 'nd', 3: 'rd', 21: 'st', 22: 'nd', 23: 'rd', 31: 'st' }
+  const days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']
 
-  let getTimespan = (sub) => {
-    let frequency = prop('frequency', sub)
-    let freq = frequency.toLowerCase()
-    let date = new Date()
+  const getTimespan = (sub) => {
+    const freq = toLower(prop('frequency', sub))
+    const date = new Date()
 
-    if (freq === 'hourly') return 'hour'
-    if (freq === 'daily') return '24 hours'
-    if (freq === 'weekly') return `${days[date.getDay()]}`
-    if (freq === 'monthly') return `${date.getDate() + (human[date.getDate()] || 'th')} of the month`
+    switch (freq) {
+      case 'hourly':
+        return 'hour'
+      case 'daily':
+        return '24 hours'
+      case 'weekly':
+        return `${days[date.getDay()]}`
+      case 'monthly':
+        return `${date.getDate() + (human[date.getDate()] || 'th')} of the month`
+    }
   }
   return getTimespan(sub)
 }
 
-export const recurringFee = (trade) => `${Currency.formatFiat(((trade.sendAmount / 100) - (trade.inAmount / 100)))} ${prop('inCurrency', trade)}`
+export const recurringFee = (trade) =>
+  `${Currency.formatFiat(((trade.sendAmount / 100) - (trade.inAmount / 100)))} ${prop('inCurrency', trade)}`