Merge pull request #16 from Permissionless-Software-Foundation/dh-pri…

…ce-calls feat(price): Get price from minimal-slp-wallet and not bch-js
Permissionless-Software-Foundation · Mar 16, 2022 · dacfa24 · dacfa24
2 parents aa33b04 + 44cd8a4
commit dacfa24
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 49 deletions.
diff --git a/src/components/admin-lte/configure/servers.js b/src/components/admin-lte/configure/servers.js
@@ -64,7 +64,7 @@ class Servers extends React.Component {
                                 type='primary'
                                 onClick={_this.handleNewServerUrl}
                               />
-                          }
+                            }
                           />
                           )
                         : (
@@ -80,7 +80,7 @@ class Servers extends React.Component {
                                 icon='fa-plus'
                                 onClick={_this.handleTextField}
                               />
-                          }
+                            }
                           />
                           )}
                     </Col>
@@ -303,16 +303,7 @@ class Servers extends React.Component {
         await bchWalletLib.walletInfoPromise
         const myBalance = await bchWalletLib.getBalance()
 
-        const bchjs = bchWalletLib.bchjs
-
-        let currentRate
-
-        if (bchjs.restURL.includes('abc.fullstack')) {
-          currentRate = (await bchjs.Price.getBchaUsd()) * 100
-        } else {
-          // BCHN price.
-          currentRate = (await bchjs.Price.getUsd()) * 100
-        }
+        const currentRate = (await bchWalletLib.getUsd()) * 100
 
         _this.setState({
           currentRate: currentRate

diff --git a/src/components/admin-lte/send-receive/send.js b/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
-
-        if (bchjs.restURL.includes('abc.fullstack')) {
-          currentRate = (await bchjs.Price.getBchaUsd()) * 100
-        } else {
-          // BCHN price.
-          currentRate = (await bchjs.Price.getUsd()) * 100
-        }
+        const currentRate = (await bchWalletLib.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
-
-        if (bchjs.restURL.includes('abc.fullstack')) {
-          currentRate = (await bchjs.Price.getBchaUsd()) * 100
-        } else {
-          // BCHN price.
-          currentRate = (await bchjs.Price.getUsd()) * 100
-        }
+        const currentRate = (await bchWalletLib.getUsd()) * 100
 
         _this.props.updateBalance({ myBalance, currentRate })
       }, 1000)

diff --git a/src/components/admin-lte/wallet/create.js b/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
-
-      let currentRate
-
-      if (bchjs.restURL.includes('abc.fullstack')) {
-        currentRate = (await bchjs.Price.getBchaUsd()) * 100
-      } else {
-        // BCHN price.
-        currentRate = (await bchjs.Price.getUsd()) * 100
-      }
+      const currentRate = (await bchWalletLib.getUsd()) * 100
 
       // console.log("myBalance", myBalance)
       // Update redux state

diff --git a/src/components/admin-lte/wallet/import.js b/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
-      let currentRate
-
-      if (bchjs.restURL.includes('abc.fullstack')) {
-        currentRate = (await bchjs.Price.getBchaUsd()) * 100
-      } else {
-        // BCHN price.
-        currentRate = (await bchjs.Price.getUsd()) * 100
-      }
+      const currentRate = (await bchWalletLib.getUsd()) * 100
 
       _this.setState({
         currentRate: currentRate