fix(coinify sell history expired trades)

blockchain · May 29, 2018 · 0c0950f · 0c0950f
1 parent adb88f5
commit 0c0950f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/...ockchain-wallet-v4-frontend/src/components/BuySell/OrderHistoryTable/OrderStatus/index.js b/...ockchain-wallet-v4-frontend/src/components/BuySell/OrderHistoryTable/OrderStatus/index.js
@@ -24,6 +24,7 @@ const renderStatus = (status, isBuy) => {
     case 'rejected': return <FormattedMessage id='scenes.buysellorderhistory.list.orderstatus.rejected' defaultMessage='Rejected' />
     case 'failed': return <FormattedMessage id='scenes.buysellorderhistory.list.orderstatus.failed' defaultMessage='Failed' />
     case 'cancelled': return <FormattedMessage id='scenes.buysellorderhistory.list.orderstatus.cancelled' defaultMessage='Cancelled' />
+    case 'expired': return <FormattedMessage id='scenes.buysellorderhistory.list.orderstatus.expired' defaultMessage='Expired' />
     default: return <FormattedMessage id='scenes.buysellorderhistory.list.orderstatus.unknown' defaultMessage='Unknown' />
   }
 }

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/modules/coinify/sagas.js b/packages/blockchain-wallet-v4-frontend/src/data/modules/coinify/sagas.js
@@ -61,8 +61,8 @@ export default ({ coreSagas }) => {
 
   const sell = function * () {
     try {
-      const trade = yield call(coreSagas.data.coinify.sell)
       yield put(A.coinifyLoading())
+      const trade = yield call(coreSagas.data.coinify.sell)
 
       if (!trade) {
         const trade = yield select(selectors.core.data.coinify.getTrade)
@@ -85,21 +85,15 @@ export default ({ coreSagas }) => {
       } else {
         payment = yield payment.to(trade.receiveAddress)
       }
-      payment = yield payment.description(`Exchange Trade COINIFY=${trade.id}`)
 
-      try {
-        payment = yield payment.build()
-      } catch (e) {
-        yield put(actions.logs.logErrorMessage(logLocation, 'sell', e))
-      }
+      payment = yield payment.description(`Exchange Trade COINIFY=${trade.id}`)
+      payment = yield payment.build()
 
       yield put(sendBtcActions.sendBtcPaymentUpdated(Remote.of(payment.value())))
       const password = yield call(promptForSecondPassword)
       payment = yield payment.sign(password)
       payment = yield payment.publish()
-
       yield put(sendBtcActions.sendBtcPaymentUpdated(Remote.of(payment.value())))
-
       yield put(A.coinifySuccess())
       yield put(actions.form.change('buySellTabStatus', 'status', 'order_history'))
     } catch (e) {

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/CoinifyTradeDetails/Trade.js b/packages/blockchain-wallet-v4-frontend/src/modals/CoinifyTradeDetails/Trade.js
@@ -16,7 +16,6 @@ export const ButtonRow = styled.div`
 const Trade = ({ trade, close }) => {
   const headerStatus = statusHelper(trade.state)
   const bodyStatus = bodyStatusHelper(trade.state, trade.isBuy)
-  console.log(trade)
   const details = tradeDetails.renderDetails(trade)
 
   return (

diff --git a/packages/blockchain-wallet-v4/src/redux/data/coinify/sagas.js b/packages/blockchain-wallet-v4/src/redux/data/coinify/sagas.js
@@ -197,7 +197,6 @@ export default ({ api, options }) => {
       const accounts = yield apply(mediums[medium], mediums[medium].getAccounts)
       const buyResult = yield apply(accounts[0], accounts[0].buy)
       yield put(A.handleTradeSuccess(buyResult))
-      console.log('coinify buy result in core', buyResult)
       yield put(A.fetchTrades())
       yield call(getCoinify)
       return buyResult