refactor(buy sell template loading)

blockchain · May 30, 2018 · 7e02483 · 7e02483
1 parent bff6908
commit 7e02483
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 30 deletions.
diff --git a/...ges/blockchain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/Buy/index.js b/...ges/blockchain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/Buy/index.js
@@ -4,7 +4,7 @@ import { connect } from 'react-redux'
 import { bindActionCreators } from 'redux'
 import { getData } from './selectors'
 import Success from './template.success'
-import Loading from '../../../template.loading'
+import Loading from 'components/BuySell/Loading'
 
 class CoinifyBuyContainer extends React.Component {
   constructor (props) {
@@ -42,7 +42,7 @@ class CoinifyBuyContainer extends React.Component {
     })
 
     return data.cata({
-      Success: (value) => <Success {...this.props}
+      Success: (value) => <Success
         value={value}
         handleTrade={handleTrade}
         showModal={showModal}

diff --git a/...blockchain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/Buy/selectors.js b/...blockchain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/Buy/selectors.js
@@ -1,11 +1,9 @@
 import { formValueSelector } from 'redux-form'
 import { lift, path } from 'ramda'
-// import settings from 'config'
 import { selectors } from 'data'
 
 export const getProfileData = (state) => {
   const profile = selectors.core.data.coinify.getProfile(state)
-  // const nextAddress = selectors.core.common.bitcoin.getNextAvailableReceiveAddress(settings.NETWORK_BITCOIN, 0, state)
   const kycs = selectors.core.data.coinify.getSortedKycs(state)
   return lift((profile, kycs) => ({ profile, kycs }))(profile, kycs)
 }

diff --git a/...chain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/OrderHistory/index.js b/...chain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/OrderHistory/index.js
@@ -4,7 +4,7 @@ import { connect } from 'react-redux'
 import { bindActionCreators } from 'redux'
 import { getData } from './selectors'
 import Success from './template.success.js'
-import Loading from '../../../template.loading.js'
+import Loading from 'components/BuySell/Loading'
 
 class OrderHistoryContainer extends React.Component {
   componentDidMount () {

diff --git a/...es/blockchain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/QuoteInput.js b/...es/blockchain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/QuoteInput.js
@@ -6,7 +6,7 @@ import { connect } from 'react-redux'
 import { bindActionCreators } from 'redux'
 import { path } from 'ramda'
 import { getQuoteInputData } from './selectors'
-import Loading from '../../template.loading'
+import Loading from 'components/BuySell/Loading'
 
 class QuoteInput extends Component {
   render () {

diff --git a/...t-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/Sell/AddCustomerDetails/index.js b/...t-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/Sell/AddCustomerDetails/index.js
@@ -5,7 +5,7 @@ import { connect } from 'react-redux'
 import { actions } from 'data'
 import { getData } from './selectors.js'
 import Success from './template.success.js'
-import Loading from '../../../../template.loading'
+import Loading from 'components/BuySell/Loading'
 class AddCustomerDetailsContainer extends React.PureComponent {
   constructor (props) {
     super(props)

diff --git a/...allet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/Sell/SelectAccounts/index.js b/...allet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/Sell/SelectAccounts/index.js
@@ -6,7 +6,7 @@ import { prop } from 'ramda'
 import { actions } from 'data'
 import { getData } from './selectors.js'
 import Success from './template.success.js'
-import Loading from '../../../../template.loading'
+import Loading from 'components/BuySell/Loading'
 
 class SelectAccountsContainer extends React.PureComponent {
   constructor (props) {

diff --git a/...es/blockchain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/Sell/index.js b/...es/blockchain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/Sell/index.js
@@ -4,7 +4,7 @@ import { connect } from 'react-redux'
 import { bindActionCreators } from 'redux'
 import { getData } from './selectors'
 import Success from './template.success'
-import Loading from '../../../template.loading'
+import Loading from 'components/BuySell/Loading'
 
 class SellContainer extends React.Component {
   constructor (props) {

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/BuySell/SfoxCheckout/Content/index.js b/packages/blockchain-wallet-v4-frontend/src/scenes/BuySell/SfoxCheckout/Content/index.js
@@ -4,7 +4,7 @@ import { connect } from 'react-redux'
 import { bindActionCreators } from 'redux'
 import { getBase, getData, getErrors, getQuote, getSellQuote, getTrades, getPayment } from './selectors'
 import Success from './template.success'
-import Loading from '../../template.loading'
+import Loading from 'components/BuySell/Loading'
 import { path } from 'ramda'
 
 class SfoxCheckout extends React.PureComponent {

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/BuySell/index.js b/packages/blockchain-wallet-v4-frontend/src/scenes/BuySell/index.js
@@ -10,7 +10,7 @@ import { Field, reduxForm } from 'redux-form'
 import { TabMenuBuySellStatus } from 'components/Form'
 import HorizontalMenu from 'components/HorizontalMenu'
 import SelectPartner from './template.success'
-import Loading from './template.loading'
+import Loading from 'components/BuySell/Loading'
 import ui from 'redux-ui'
 import { hasAccount } from 'services/ExchangeService'
 

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/BuySell/template.loading.js b/packages/blockchain-wallet-v4-frontend/src/scenes/BuySell/template.loading.js