From a03c9b888f6ea2376c253e841de0657faf2b9c06 Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Wed, 15 Jul 2020 03:25:01 -0700
Subject: [PATCH] add ocean token & any token balance to Account

---
 src/ocean/Account.ts  | 22 ++++++++--------------
 src/ocean/Accounts.ts | 12 ++++++------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/ocean/Account.ts b/src/ocean/Account.ts
index bf447930..cd146c51 100644
--- a/src/ocean/Account.ts
+++ b/src/ocean/Account.ts
@@ -79,7 +79,7 @@ export default class Account extends Instantiable {
      * Balance of Any Token (converted from wei).
      * @return {Promise<string>}
      */
-    public async getTokenBalance(TokenAdress: string): Promise<number> {
+    public async getTokenBalance(TokenAdress: string): Promise<string> {
         if (TokenAdress === null) return null
         const minABI = [
             {
@@ -117,10 +117,10 @@ export default class Account extends Instantiable {
     }
 
     /**
-     * Balance of Ocean Token.
+     * Balance of Ocean Token. (converted from wei).
      * @return {Promise<string>}
      */
-    public async getOceanBalance(): Promise<number> {
+    public async getOceanBalance(): Promise<string> {
         return this.getTokenBalance(this.config.oceanTokenAddress)
     }
 
@@ -134,17 +134,11 @@ export default class Account extends Instantiable {
     }
 
     /**
-     * Balance of Ether.
-     * @return {Promise<number>}
+     * Balance of Ether.(converted from wei).
+     * @return {Promise<string>}
      */
-    public async getEtherBalance(): Promise<number> {
-        // TO DO
-        /* return this.web3.eth
-            .getBalance(this.id, 'latest')
-            .then((balance: string): number => {
-                return new BigNumber(balance).toNumber()
-            })
-        */
-        return 0
+    public async getEtherBalance(): Promise<string> {
+        const result = await this.web3.eth.getBalance(this.id, 'latest')
+        return this.web3.utils.fromWei(result)
     }
 }
diff --git a/src/ocean/Accounts.ts b/src/ocean/Accounts.ts
index cd772988..ed3e20ce 100644
--- a/src/ocean/Accounts.ts
+++ b/src/ocean/Accounts.ts
@@ -34,27 +34,27 @@ export class Accounts extends Instantiable {
      * Return account balance for a given ERC20 token
      * @param  {String}          TokenAddress .
      * @param  {Account}          account Account instance.
-     * @return {Promise<Balance>}         Ether and Ocean Token balance.
+     * @return {Promise<String>}         Token balance.
      */
-    public getTokenBalance(TokenAddress: string, account: Account): Promise<number> {
+    public getTokenBalance(TokenAddress: string, account: Account): Promise<string> {
         return account.getTokenBalance(TokenAddress)
     }
 
     /**
      * Return account balance for a Ocean Tokens
      * @param  {Account}          account Account instance.
-     * @return {Promise<Balance>}         Ether and Ocean Token balance.
+     * @return {Promise<String>}         Ocean Token balance.
      */
-    public getOceanBalance(account: Account): Promise<number> {
+    public getOceanBalance(account: Account): Promise<string> {
         return account.getOceanBalance()
     }
 
     /**
      * Return account balance in ETH
      * @param  {Account}          account Account instance.
-     * @return {Promise<Balance>}         Ether and Ocean Token balance.
+     * @return {Promise<String>}         Ether  balance.
      */
-    public getEtherBalance(account: Account): Promise<number> {
+    public getEtherBalance(account: Account): Promise<string> {
         return account.getEtherBalance()
     }
 }