blockstrap wallet now working perfectly - as far as my semi-limited t…

…esting can tell - so am now ready to move-on to making blockstrap work with other APIs, and or return to clean-up the everstore export experience whilst I wait for spinal
blockstrap · Apr 19, 2016 · 8b8c463 · 8b8c463
1 parent cef613f
commit 8b8c463
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 20 deletions.
diff --git a/blockstrap/html/bootstrap/jumbotrons.html b/blockstrap/html/bootstrap/jumbotrons.html
@@ -7,6 +7,7 @@ <h1>{{title}}</h1>
         <span class="actions">
             {{#buttons}}
                 <a href="{{href}}" 
+                    id="{{id}}"
                     class="btn {{css}}"
                     {{#attributes}}
                         {{key}}="{{value}}"

diff --git a/blockstrap/js/modules/accounts.js b/blockstrap/js/modules/accounts.js
@@ -246,6 +246,27 @@
                         address = this_chain_obj;
                     }
                 });
+                if(!address && typeof account.addresses != 'undefined')
+                {
+                    $.each(account.addresses, function(this_chain, this_chain_obj)
+                    {
+                        $.each(this_chain_obj.chains, function(this_inner_chain, this_inner_chain_address)
+                        {
+                            $.each(this_inner_chain_address, function(k, this_address)
+                            {
+                                if(this_address == key)
+                                {
+                                    address = {
+                                        tx_count: 0,
+                                        received: 0,
+                                        balance: 0,
+                                        code: this_inner_chain
+                                    }
+                                }
+                            });
+                        });
+                    }); 
+                }
             });
         }
         return address;

diff --git a/blockstrap/js/modules/templates.js b/blockstrap/js/modules/templates.js
@@ -40,6 +40,7 @@
             // ADDRESS INFO
             var archived = '';
             var address_url = '';
+            var address_hidden = '';
             var current_account = false;
             var add_blockchain = 'Bitcoin';
             var address_received = 0;
@@ -94,16 +95,23 @@
                             }
                         });
                     current_txs+= '</ul>';
+                    if(account.tx_count < 1)
+                    {
+                        key+= ' (ARCHIVED)';
+                        account.tx_count = 'N/A';
+                    }
                 }
             }
             else if(key)
             {
-                archived = ' (ARCHIVED)';
-                account.tx_count = 'RE-SYNC will not store detals due to being archived address';
+                key = 'N/A';
+                address_hidden = 'hidden';
+                account.tx_count = 'N/A';
             }
 
             // TX INFO
             var tx_url = '';
+            var tx_hidden = '';
             var current_tx = false;
             var tx_blockchain = 'Bitcoin';
             var txid = blockstrap_functions.vars('txid');
@@ -120,9 +128,14 @@
             if($.isPlainObject($.fn.blockstrap.accounts))
             {
                 current_tx = $.fn.blockstrap.accounts.tx(txid);
+                if(!current_tx) 
+                {
+                    txid = 'N/A';
+                    tx_hidden = 'hidden';
+                }
             }
 
-            if(txid && typeof current_tx.tx != 'undefined' && typeof current_tx.tx.blockchain != 'undefined')
+            if(txid && txid != 'N/A' && typeof current_tx.tx != 'undefined' && typeof current_tx.tx.blockchain != 'undefined')
             {
                 tx_blockchain = $.fn.blockstrap.settings.blockchains[current_tx.tx.blockchain].blockchain;
                 if(typeof typeof current_tx.tx.size != 'undefined') tx.size = current_tx.tx.size;
@@ -133,7 +146,7 @@
                 if(typeof current_tx.tx.block != 'undefined' && current_tx.tx.block) tx.block = current_tx.tx.block;
                 else
                 {
-                    tx.block = 'Must RE-SYNC to fetch live details!';
+                    tx.block = 'N/A';
                 }
                 var base_api_url = $.fn.blockstrap.settings.blockchains[current_tx.tx.blockchain].apis[$.fn.blockstrap.settings.api_service];
                 var tx_slugs = $.fn.blockstrap.settings.apis.defaults[$.fn.blockstrap.settings.api_service].functions.to.transaction;
@@ -162,7 +175,9 @@
                 'tx.output',
                 'tx.fees',
                 'address.tx_count',
-                'address.balance'
+                'address.balance',
+                'address.hidden',
+                'tx.hidden'
             ];
             var replacements = [
                 $.fn.blockstrap.settings.base_url,
@@ -183,7 +198,9 @@
                 parseInt(tx.output) / 100000000 + ' ' + tx_blockchain,
                 parseInt(tx.fees) / 100000000 + ' ' + tx_blockchain,
                 account.tx_count,
-                parseInt(account.balance) / 100000000 + ' ' + add_blockchain
+                parseInt(account.balance) / 100000000 + ' ' + add_blockchain,
+                address_hidden,
+                tx_hidden
             ];
         }
 

diff --git a/themes/default/data/address.json b/themes/default/data/address.json
@@ -14,13 +14,8 @@
                             "buttons": [
                                 {
                                     "href": "{{urls.address}}",
-                                    "css": "btn-success",
-                                    "text": "RAW JSON"
-                                },
-                                {
-                                    "href": "#",
-                                    "css": "btn-primary btn-update-address",
-                                    "text": "RE-SYNC"
+                                    "css": "btn-success {{address.hidden}}",
+                                    "text": "LIVE DATA"
                                 }
                             ]
                         }

diff --git a/themes/default/data/transaction.json b/themes/default/data/transaction.json
@@ -14,13 +14,8 @@
                             "buttons": [
                                 {
                                     "href": "{{urls.tx}}",
-                                    "css": "btn-success",
-                                    "text": "RAW JSON"
-                                },
-                                {
-                                    "href": "#",
-                                    "css": "btn-primary btn-update-tx",
-                                    "text": "RE-SYNC"
+                                    "css": "btn-success {{tx.hidden}}",
+                                    "text": "LIVE DATA"
                                 }
                             ]
                         }