Merge pull request #16 from Permissionless-Software-Foundation/dh-price-calls

feat(price): Get price from minimal-slp-wallet and not bch-js

src/components/admin-lte/configure/servers.js

@@ -303,16 +303,7 @@ class Servers extends React.Component {
         await bchWalletLib.walletInfoPromise
         const myBalance = await bchWalletLib.getBalance()
 
-        const bchjs = bchWalletLib.bchjs
+        const currentRate = (await bchWalletLib.getUsd()) * 100
-
-        let currentRate
-
-        if (bchjs.restURL.includes('abc.fullstack')) {
-          currentRate = (await bchjs.Price.getBchaUsd()) * 100
-        } else {
-          // BCHN price.
-          currentRate = (await bchjs.Price.getUsd()) * 100
-        }
 
         _this.setState({
           currentRate: currentRate

src/components/admin-lte/send-receive/send.js

@@ -284,16 +284,8 @@ class Send extends React.Component {
       // update balance
       setTimeout(async () => {
         const myBalance = await bchWalletLib.getBalance()
-        const bchjs = bchWalletLib.bchjs
 
-        let currentRate
+        const currentRate = (await bchWalletLib.getUsd()) * 100
-
-        if (bchjs.restURL.includes('abc.fullstack')) {
-          currentRate = (await bchjs.Price.getBchaUsd()) * 100
-        } else {
-          // BCHN price.
-          currentRate = (await bchjs.Price.getUsd()) * 100
-        }
 
         _this.props.updateBalance({ myBalance, currentRate })
       }, 1000)
@@ -365,16 +357,8 @@ class Send extends React.Component {
       // update balance
       setTimeout(async () => {
         const myBalance = await bchWalletLib.getBalance()
-        const bchjs = bchWalletLib.bchjs
 
-        let currentRate
+        const currentRate = (await bchWalletLib.getUsd()) * 100
-
-        if (bchjs.restURL.includes('abc.fullstack')) {
-          currentRate = (await bchjs.Price.getBchaUsd()) * 100
-        } else {
-          // BCHN price.
-          currentRate = (await bchjs.Price.getUsd()) * 100
-        }
 
         _this.props.updateBalance({ myBalance, currentRate })
       }, 1000)

src/components/admin-lte/wallet/create.js

@@ -97,16 +97,7 @@ class NewWallet extends React.Component {
 
       const myBalance = await bchWalletLib.getBalance()
 
-      const bchjs = bchWalletLib.bchjs
+      const currentRate = (await bchWalletLib.getUsd()) * 100
-
-      let currentRate
-
-      if (bchjs.restURL.includes('abc.fullstack')) {
-        currentRate = (await bchjs.Price.getBchaUsd()) * 100
-      } else {
-        // BCHN price.
-        currentRate = (await bchjs.Price.getUsd()) * 100
-      }
 
       // console.log("myBalance", myBalance)
       // Update redux state

src/components/admin-lte/wallet/import.js

@@ -135,15 +135,7 @@ class ImportWallet extends React.Component {
       Object.assign(currentWallet, walletInfo)
 
       const myBalance = await bchWalletLib.getBalance()
-      const bchjs = bchWalletLib.bchjs
+      const currentRate = (await bchWalletLib.getUsd()) * 100
-      let currentRate
-
-      if (bchjs.restURL.includes('abc.fullstack')) {
-        currentRate = (await bchjs.Price.getBchaUsd()) * 100
-      } else {
-        // BCHN price.
-        currentRate = (await bchjs.Price.getUsd()) * 100
-      }
 
       _this.setState({
         currentRate: currentRate