Merge branch 'develop'

Author: H

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "zabo-nodejs-quickstart-app",
-  "version": "0.9.1",
+  "version": "0.10.0",
   "private": true,
   "scripts": {
     "start": "node ./bin/www"
@@ -14,6 +14,6 @@
     "morgan": "~1.9.1",
     "open": "^7.0.0",
     "pug": "^2.0.4",
-    "zabo-sdk-js": "^0.9.0"
+    "zabo-sdk-js": "^0.10.0"
   }
-}
+}

package.json

@@ -117,12 +117,16 @@
       for (let i = 0; i < transactions.length; i++) {
         let row = document.createElement('tr')
 
-        let idAnchor = document.createElement('a')
-        idAnchor.href = Utils.getExplorerUrl(transactions[i].currency, 'tx/' + transactions[i].id)
-        idAnchor.target = '_blank'
-        idAnchor.innerText = (transactions[i].id || '').substr(0, 7) + '...'
         let id = document.createElement('td')
-        id.appendChild(idAnchor)
+        if ((transactions[i].id || '').substr(0, 2) === '0x') {
+          let idAnchor = document.createElement('a')
+          idAnchor.href = Utils.getExplorerUrl(transactions[i].currency, 'tx/' + transactions[i].id)
+          idAnchor.target = '_blank'
+          idAnchor.innerText = (transactions[i].id || '').substr(0, 7) + '...'
+          id.appendChild(idAnchor)
+        } else {
+          id.innerText = (transactions[i].id || '').substr(0, 7) + '...'
+        }
         row.appendChild(id)
 
         let currency = document.createElement('td')

public/scripts/script.js

@@ -1,26 +1,26 @@
 class Utils {
-  show (selector) {
+  show(selector) {
     let elem = document.querySelector(selector)
 
     if (elem) {
       elem.hidden = false
     }
   }
 
-  hide (selector) {
+  hide(selector) {
     let elem = document.querySelector(selector)
 
     if (elem) {
       elem.hidden = true
     }
   }
 
-  get (url) {
+  get(url) {
     return window.fetch(url)
       .then(resp => resp.json())
   }
 
-  post (url, data) {
+  post(url, data) {
     return window.fetch(url, {
       method: 'POST',
       headers: {
@@ -32,16 +32,12 @@ class Utils {
       .then(resp => resp.json())
   }
 
-  getExplorerUrl (currency, path) {
+  getExplorerUrl(currency, path) {
     switch (currency) {
-      case 'HBAR':
-        return ''
-      case 'BTC':
-        return 'https://www.blockchain.com/btctest/' + path
-      case 'BCH':
-        return 'https://explorer.bitcoin.com/tbch/' + path
+      case 'ETH':
+        return 'https://etherscan.io/' + path
       default:
-        return 'https://rinkeby.etherscan.io/' + path
+        return '' + path
     }
   }
 }

public/scripts/utils.js

@@ -38,14 +38,13 @@ router.post('/accounts', async (req, res) => {
     // Docs: https://zabo.com/docs/#get-a-specific-balance
     const balances = await zabo.users.getBalances({
       userId: myUser.id,
-      accountId: account.id,
-      currencies: ['ALL']
+      accountId: account.id
     })
 
     res.send({
       accounts: myUser.accounts,
       balances: balances.data,
-      transactions: transactions
+      transactions: transactions.data
     })
   } catch (err) {
     res.status(500).send({ message: err.message })

routes/index.js

@@ -65,7 +65,7 @@ block content
       table
         thead
           tr
-            th Wallet ID
+            th Transaction ID
             th Currency
             th Type
             th Amount

views/index.pug

@@ -3,7 +3,7 @@ html
   head
     title= title
     link(rel='stylesheet', href='/stylesheets/style.css')
-    script(src='https://cdn.zabo.com/0.9.0/zabo.js')
+    script(src='https://cdn.zabo.com/develop/0.10.0-beta.5/zabo.js')
   body
     block content
     script(src='/scripts/utils.js')