feat(nfts): move coin prices fetch back to layout

blockchain · May 4, 2022 · e671aae · e671aae
1 parent 29d7673
commit e671aae
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/layouts/Nfts/Nfts.tsx b/packages/blockchain-wallet-v4-frontend/src/layouts/Nfts/Nfts.tsx
@@ -21,11 +21,14 @@ const NftsContainer = (props) => {
   }
 
   useEffect(() => {
+    if (isCoinDataLoaded) {
+      props.coinsActions.fetchCoinsRates()
+    }
     window.addEventListener('beforeunload', doRefresh)
     return () => {
       window.removeEventListener('beforeunload', doRefresh)
     }
-  })
+  }, [isCoinDataLoaded])
 
   // IMPORTANT: do not allow routes to load until window.coins is loaded
   if (!isCoinDataLoaded) return <Loading />

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Nfts/Asset/Asset.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Nfts/Asset/Asset.tsx
@@ -265,7 +265,6 @@ const StickyWrapper = styled.div`
 
 const NftAsset: React.FC<Props> = ({
   analyticsActions,
-  coinsActions,
   defaultEthAddr,
   domains,
   formActions,
@@ -291,7 +290,6 @@ const NftAsset: React.FC<Props> = ({
   const [Tab, setTab] = useState('about')
 
   useEffect(() => {
-    coinsActions.fetchCoinsRates()
     nftsActions.fetchOpenSeaAsset({
       asset_contract_address: contract,
       token_id: id
@@ -960,7 +958,6 @@ const mapStateToProps = (state: RootState) => ({
 
 const mapDispatchToProps = (dispatch) => ({
   analyticsActions: bindActionCreators(actions.analytics, dispatch),
-  coinsActions: bindActionCreators(actions.core.data.coins, dispatch),
   formActions: bindActionCreators(actions.form, dispatch),
   nftsActions: bindActionCreators(actions.components.nfts, dispatch),
   routerActions: bindActionCreators(actions.router, dispatch)

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Nfts/Collection/Collection.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Nfts/Collection/Collection.tsx
@@ -55,14 +55,11 @@ const LinksContainer = styled.div`
   }
 `
 
-const NftsCollection: React.FC<Props> = ({ coinsActions, formActions, formValues, ...rest }) => {
+const NftsCollection: React.FC<Props> = ({ formActions, formValues, ...rest }) => {
   const { slug } = rest.computedMatch.params
   const params = new URLSearchParams(window.location.hash.split('?')[1])
   const tab = params.get('tab') === 'EVENTS' ? 'EVENTS' : 'ITEMS'
 
-  useEffect(() => {
-    coinsActions.fetchCoinsRates()
-  }, [])
   const [refreshTrigger, setRefreshTrigger] = useState<number>(0)
   const [activeTab, setActiveTab] = useState<'ITEMS' | 'EVENTS'>(tab)
 
@@ -190,7 +187,6 @@ const mapStateToProps = (state: RootState) => ({
 
 const mapDispatchToProps = (dispatch) => ({
   analyticsActions: bindActionCreators(actions.analytics, dispatch),
-  coinsActions: bindActionCreators(actions.core.data.coins, dispatch),
   formActions: bindActionCreators(actions.form, dispatch),
   modalActions: bindActionCreators(actions.modals, dispatch)
 })

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Nfts/Home/Home.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Nfts/Home/Home.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react'
+import React from 'react'
 import { FormattedMessage } from 'react-intl'
 import { connect, ConnectedProps } from 'react-redux'
 import { LinkContainer } from 'react-router-bootstrap'
@@ -40,9 +40,6 @@ const Banner = styled.div`
 `
 
 const Explore: React.FC<Props> = (props) => {
-  useEffect(() => {
-    props.coinsActions.fetchCoinsRates()
-  }, [])
   const [results] = useCollectionsQuery({
     variables: {
       sort: { by: CollectionSortFields.OneDayVolume, direction: SortDirection.Desc }
@@ -98,7 +95,6 @@ const Explore: React.FC<Props> = (props) => {
 }
 
 const mapDispatchToProps = (dispatch) => ({
-  coinsActions: bindActionCreators(actions.core.data.coins, dispatch),
   nftsActions: bindActionCreators(actions.components.nfts, dispatch),
   routerActions: bindActionCreators(actions.router, dispatch)
 })