Migrate to the new API + Fix NEM setup on testrpc (#438)

Chrono-Tech · Dec 22, 2017 · 4b8c8d7 · 4b8c8d7
1 parent a6033c1
commit 4b8c8d7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/packages/login/network/NemMiddlewareNode.js b/packages/login/network/NemMiddlewareNode.js
@@ -94,10 +94,10 @@ export default class NemMiddlewareNode extends AbstractNode {
         mosaics,
       } = res.data
       return {
-        balance: new BigNumber(balance),
+        balance: new BigNumber(balance.value),
         mosaics: Object.entries(mosaics).reduce((t, [k, v]) => ({
           ...t,
-          [k]: new BigNumber(v),
+          [k]: new BigNumber(v.value),
         }), {}),
       }
     } catch (e) {

diff --git a/src/dao/ERC20ManagerDAO.js b/src/dao/ERC20ManagerDAO.js
@@ -175,10 +175,13 @@ export default class ERC20ManagerDAO extends AbstractContractDAO {
   }
 
   async _setupNemTokens () {
-    return await Promise.all([
-      this._setupNemMosaic('XEM', 'XEM', new NemDAO('XEM', 'XEM', nemProvider, null, 6)),
-      ...(nemProvider.getMosaics() || []).map((m) => this._setupNemMosaic(m.name, m.title, new NemDAO(m.name, m.symbol, nemProvider, m.namespace, 2))),
-    ])
+    if (nemProvider.isInitialized()) {
+      return await Promise.all([
+        this._setupNemMosaic('XEM', 'XEM', new NemDAO('XEM', 'XEM', nemProvider, null, 6)),
+        ...(nemProvider.getMosaics() || []).map((m) => this._setupNemMosaic(m.name, m.title, new NemDAO(m.name, m.symbol, nemProvider, m.namespace, 2))),
+      ])
+    }
+    return []
   }
 
   async _setupNemMosaic (name, title, dao) {

diff --git a/src/dao/NemDAO.js b/src/dao/NemDAO.js
@@ -92,8 +92,8 @@ export default class NemDAO {
   async watchBalance (callback) {
     this._nemProvider.addListener(EVENT_BALANCE, async ({ account, time, balance }) => {
       const b = this._mosaic
-        ? balance.balance
-        : balance.mosaics[this._mosaic]
+        ? balance.balance.value
+        : balance.mosaics[this._mosaic].value
       callback({
         account,
         time,