get assets also if there is no account connected, but given

DePayFi · Aug 31, 2021 · abac9a9 · abac9a9
1 parent 78102c1
commit abac9a9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/dist/cjs/index.js b/dist/cjs/index.js
@@ -34,12 +34,11 @@ const getAssets = async (options) => {
   if(options === undefined) { options = {}; }
 
   let wallet = await depayWeb3Wallets.getWallet();
-  if (!wallet) { return }
 
   let account;
   if(options.account) {
     account = options.account;
-  } else {
+  } else if(wallet) {
     account = await wallet.account();
   }
   if (!account) { return }

diff --git a/dist/es/index.js b/dist/es/index.js
@@ -30,12 +30,11 @@ const getAssets = async (options) => {
   if(options === undefined) { options = {}; }
 
   let wallet = await getWallet();
-  if (!wallet) { return }
 
   let account;
   if(options.account) {
     account = options.account;
-  } else {
+  } else if(wallet) {
     account = await wallet.account();
   }
   if (!account) { return }

diff --git a/dist/umd/index.js b/dist/umd/index.js
@@ -32,12 +32,11 @@
     if(options === undefined) { options = {}; }
 
     let wallet = await depayWeb3Wallets.getWallet();
-    if (!wallet) { return }
 
     let account;
     if(options.account) {
       account = options.account;
-    } else {
+    } else if(wallet) {
       account = await wallet.account();
     }
     if (!account) { return }

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "depay-web3-assets",
   "moduleName": "Web3Assets",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "",
   "main": "dist/cjs/index.js",
   "module": "dist/es/index.js",

diff --git a/src/index.js b/src/index.js
@@ -30,12 +30,11 @@ const getAssets = async (options) => {
   if(options === undefined) { options = {} }
 
   let wallet = await getWallet()
-  if (!wallet) { return }
 
   let account
   if(options.account) {
     account = options.account
-  } else {
+  } else if(wallet) {
     account = await wallet.account()
   }
   if (!account) { return }

diff --git a/tests/units/getAssets.spec.js b/tests/units/getAssets.spec.js
@@ -16,7 +16,7 @@ describe('assets', ()=>{
     ).rejects.toEqual('Web3Wallets: Please pass an apiKey. See documentation.')
   })
 
-  describe('fetch assets', ()=>{
+  describe('fetch assets for connected wallet', ()=>{
 
     beforeEach(()=>{
       mock({ blockchain: 'ethereum', wallet: 'metamask' })
@@ -120,8 +120,11 @@ describe('assets', ()=>{
         }
       ])
     })
+  })
+
+  describe('fetch assets for given account (no connected wallet)', ()=>{
 
-    it('fetches the assets for a given account', async()=> {
+    it('fetches the assets for a given account without any connected wallet', async()=> {
       let account = '0xEcA533Ef096f191A35DE76aa4580FA3A722724bE'
       fetchMock.get({
           url: `https://api.depay.pro/v1/assets?account=${account}&blockchain=ethereum`,