Fix getTransactionSenderAccountIfExistsAsync to return true senderAddress or undefined if non available

2 files changed, 5 insertions, 4 deletions

diff --git a/src/0x.js.ts b/src/0x.js.ts
index 6713ec885..679d748e7 100644
--- a/src/0x.js.ts
+++ b/src/0x.js.ts
@@ -124,10 +124,11 @@ export class ZeroEx {
         this.web3Wrapper.setDefaultAccount(account);
     }
     /**
-     * Gets default account for sending transactions.
+     * Get the default account set for sending transactions.
      */
-    public getTransactionSenderAccount(): string {
-        return this.web3Wrapper.getDefaultAccount();
+    public async getTransactionSenderAccountIfExistsAsync(): Promise<string|undefined> {
+        const senderAccountIfExists = await this.web3Wrapper.getSenderAddressIfExistsAsync();
+        return senderAccountIfExists;
     }
     /**
      * Computes the orderHash given the order parameters and returns it as a hex encoded string.
diff --git a/src/web3_wrapper.ts b/src/web3_wrapper.ts
index 900c127d5..49bd8b67d 100644
--- a/src/web3_wrapper.ts
+++ b/src/web3_wrapper.ts
@@ -69,7 +69,7 @@ export class Web3Wrapper {
         const {timestamp} = await promisify(this.web3.eth.getBlock)(blockHash);
         return timestamp;
     }
-    private async getSenderAddressIfExistsAsync(): Promise<string|undefined> {
+    public async getSenderAddressIfExistsAsync(): Promise<string|undefined> {
         const defaultAccount = this.web3.eth.defaultAccount;
         if (!_.isUndefined(defaultAccount)) {
             return defaultAccount;