Merge branch 'development' into feat/logging

blockchain · Mar 11, 2019 · 088f4c7 · 088f4c7
2 parents 6ce422f + 8384312
commit 088f4c7
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 7 deletions.
diff --git a/...s/blockchain-wallet-v4-frontend/src/components/TransactionListItem/Confirmations/index.js b/...s/blockchain-wallet-v4-frontend/src/components/TransactionListItem/Confirmations/index.js
@@ -66,7 +66,7 @@ const getMinConfirms = coin => {
 const Confirmations = props => {
   const { blockHeight, coin, txBlockHeight } = props
   const conf = blockHeight - txBlockHeight + 1
-  const confirmations = conf > 0 ? conf : 0
+  const confirmations = conf > 0 && txBlockHeight ? conf : 0
   const minConfirmations = getMinConfirms(coin)
 
   return (

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/sendEth/sagas.js b/packages/blockchain-wallet-v4-frontend/src/data/components/sendEth/sagas.js
@@ -45,7 +45,6 @@ export default ({ coreSagas, networks }) => {
       yield put(initialize(FORM, initialValues))
       yield put(A.sendEthPaymentUpdatedSuccess(payment.value()))
     } catch (e) {
-      yield put(A.sendEthPaymentUpdatedFailure(e))
       yield put(
         actions.logs.logErrorMessage(logLocation, 'sendEthInitialized', e)
       )

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/sendEth/sagas.spec.js b/packages/blockchain-wallet-v4-frontend/src/data/components/sendEth/sagas.spec.js
@@ -156,8 +156,6 @@ describe('sendEth sagas', () => {
         saga
           .restore(beforeEnd)
           .throw(error)
-          .put(A.sendEthPaymentUpdatedFailure(error))
-          .next()
           .put(
             actions.logs.logErrorMessage(
               logLocation,

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/sendXlm/sagas.js b/packages/blockchain-wallet-v4-frontend/src/data/components/sendXlm/sagas.js
@@ -51,7 +51,6 @@ export default ({ coreSagas }) => {
       yield put(touch(FORM, 'memo', 'memoType'))
       yield put(A.paymentUpdatedSuccess(payment.value()))
     } catch (e) {
-      yield put(A.paymentUpdatedFailure(e))
       yield put(actions.logs.logErrorMessage(logLocation, 'initialized', e))
     }
   }

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/sendXlm/sagas.spec.js b/packages/blockchain-wallet-v4-frontend/src/data/components/sendXlm/sagas.spec.js
@@ -142,8 +142,6 @@ describe('sendXlm sagas', () => {
         saga
           .restore(beforeEnd)
           .throw(error)
-          .put(A.paymentUpdatedFailure(error))
-          .next()
           .put(actions.logs.logErrorMessage(logLocation, 'initialized', error))
           .next()
           .isDone()