fixes decimals

evseevnn · evseevnn · commit 77c30cb6ebb4 · 2018-06-27T18:19:29.000+07:00
diff --git a/js/ethplorer.js b/js/ethplorer.js
@@ -2069,7 +2069,7 @@ Ethplorer = {
                 for(var i=1; i<parseInt(parts[1]); i++){
                     res = '0' + res;
                 }
-                return '0.' + res;
+                num = parseFloat('0.' + res);
             }
 
             if(withDecimals){
diff --git a/service/lib/ethplorer.php b/service/lib/ethplorer.php
@@ -761,7 +761,7 @@ public function getTransactionDetails($hash){
                 $result['tx']['confirmations'] = $confirmations;
             } else {
                 // if transaction in pending status
-                $result['tx']['confirmations'] = 0;
+                $result['tx']['confirmations'] = $result['tx']['blockNumber'] !== null ? 1 : 0;
             }
 
             // Temporary

Original file line number	Diff line number	Diff line change
`@@ -761,7 +761,7 @@ public function getTransactionDetails($hash){`
`761`	`761`	`$result['tx']['confirmations'] = $confirmations;`
`762`	`762`	`} else {`
`763`	`763`	`// if transaction in pending status`
`764`		`- $result['tx']['confirmations'] = 0;`
	`764`	`+ $result['tx']['confirmations'] = $result['tx']['blockNumber'] !== null ? 1 : 0;`
`765`	`765`	`}`
`766`	`766`
`767`	`767`	`// Temporary`