Merge pull request #7 from wrkzcoin/development

merge development to master
wrkzcoin · Dec 19, 2019 · 604bf5e · 604bf5e
2 parents 3724795 + ad141e8
commit 604bf5e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/app/components/NodeFee.js b/app/components/NodeFee.js
@@ -12,7 +12,8 @@ type Props = {
 };
 
 type State = {
-  nodeFee: number
+  nodeFee: number,
+  connectednode: string
 };
 
 export default class NodeFee extends Component<Props, State> {
@@ -23,7 +24,8 @@ export default class NodeFee extends Component<Props, State> {
   constructor(props?: Props) {
     super(props);
     this.state = {
-      nodeFee: session.daemon.feeAmount || 0
+      nodeFee: session.daemon.feeAmount || 0,
+	  connectednode: session.daemon.host + ':' + session.daemon.port
     };
     this.refreshNodeFee = this.refreshNodeFee.bind(this);
   }
@@ -38,19 +40,21 @@ export default class NodeFee extends Component<Props, State> {
 
   refreshNodeFee = () => {
     this.setState({
-      nodeFee: session.daemon.feeAmount
+      nodeFee: session.daemon.feeAmount,
+      connectednode: session.daemon.host + ':' + session.daemon.port,
     });
   };
 
   render() {
     const { darkMode, size } = this.props;
-    const { nodeFee } = this.state;
+    const { nodeFee, connectednode } = this.state;
     const color = darkMode ? 'is-dark' : 'is-white';
 
     if (nodeFee > 0) {
       return (
         <div className="control statusicons">
           <div className="tags has-addons">
+            <span className={`tag is-success ${size}`}>{connectednode}</span>
             <span className={`tag ${color} ${size}`}>{il8n.node_fee}</span>
             <span className={`tag is-danger ${size}`}>
               {session.atomicToHuman(nodeFee, true)} {Configure.ticker}

diff --git a/app/wallet/session.js b/app/wallet/session.js
@@ -426,7 +426,7 @@ export default class WalletSession {
   }
 
   getFiatPrice = async (fiat: string) => {
-    const apiURL = `https://api.coingecko.com/api/v3/coins/markets?vs_currency=${fiat}&ids=turtlecoin&order=market_cap_desc&per_page=100&page=1&sparkline=false&price_change_percentage=7d`;
+    const apiURL = `https://api.coingecko.com/api/v3/coins/markets?vs_currency=${fiat}&ids=${Configure.coinName.toLowerCase()}&order=market_cap_desc&per_page=100&page=1&sparkline=false&price_change_percentage=7d`;
 
     const requestOptions = {
       method: 'GET',

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pluton-wallet",
   "productName": "Pluton",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "WrkzCoin wallet based on React, React Router, Webpack, and React Hot Loader",
   "scripts": {
     "build": "concurrently \"yarn build-main\" \"yarn build-renderer\"",