From 17b79f949c99c2d7e8d7446520ca0f6e289fb271 Mon Sep 17 00:00:00 2001
From: Satinder Grewal <grewal.satinder@gmail.com>
Date: Fri, 25 Nov 2016 01:27:55 +1300
Subject: [PATCH] test

---
 assets/scripts/dashboard.js | 55 +++++++++++++++++++++----------------
 index.html                  | 12 ++++----
 2 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/assets/scripts/dashboard.js b/assets/scripts/dashboard.js
index 6653b9c..bdaac46 100644
--- a/assets/scripts/dashboard.js
+++ b/assets/scripts/dashboard.js
@@ -237,27 +237,7 @@ var Dashboard = function() {
                         });
 
 
-                        //Get coin history and pupulate balance and other info to wallet widget
-                        var historyvalues = {"timeout":20000,"immediate":100,"agent":"basilisk","method":"history","vals":{"coin":"" + AllcoinsDataOutput[value][index] + ""}};
-                        var ExecuteShowCoinHistory = setInterval(function() {
-                            if ( sessionStorage.getItem('IguanaActiveAccount') === null || sessionStorage.getItem('DashboardActions') === null || sessionStorage.getItem('DashboardActions') === "stop" ) {
-                                clearInterval(ExecuteShowCoinHistory);
-                                console.log('=> No wallet logged in, or Dashboard not ative. No need to Run History.');
-                            } else if ( sessionStorage.getItem('DashboardActions') === null || sessionStorage.getItem('DashboardActions') === "start") {
-                                if ( value == "basilisk") {
-                                  //console.log("ShowCoinHistory and ShowCoinProgressBar not executing for basilisk...");
-                                } else {
-                                  //console.log('wallet widget refereshed (every 1 seconds)');
-                                  //Show Coin Progress Bars
-                                  var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin");
-                                  ShowCoinProgressBar(active_edexcoin);
-                                  if ( sessionStorage.getItem('Activate'+active_edexcoin+'History') === 'Yes' ) {
-                                    console.log('Show coin history');
-                                    //ShowCoinHistory(historyvalues);
-                                  }
-                                }
-                            }
-                        }, 1000);
+                        
                        
                     });
                 },
@@ -281,19 +261,46 @@ var Dashboard = function() {
 
     var handleWalletWidgetBtns = function() {
         
-        
+        $('.mdl_addcoin_done_btn').click(function(){
+          ExecuteAddCoinFn();
+        });
 
         
     }
 
 
+    var handleEdexWalletInfo = function() {
+      //Get coin history and pupulate balance and other info to wallet widget
+      var ExecuteShowCoinHistory = setInterval(function() {
+          if ( sessionStorage.getItem('IguanaActiveAccount') === null || sessionStorage.getItem('DashboardActions') === null || sessionStorage.getItem('DashboardActions') === "stop" ) {
+              clearInterval(ExecuteShowCoinHistory);
+              console.log('=> No wallet logged in, or Dashboard not ative. No need to Run History.');
+          } else if ( sessionStorage.getItem('DashboardActions') === null || sessionStorage.getItem('DashboardActions') === "start") {
+              //if ( value == "basilisk") {
+                //console.log("ShowCoinHistory and ShowCoinProgressBar not executing for basilisk...");
+              //} else {
+                //console.log('wallet widget refereshed (every 1 seconds)');
+                //Show Coin Progress Bars
+                var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin");
+                ShowCoinProgressBar(active_edexcoin);
+                if ( sessionStorage.getItem('Activate'+active_edexcoin+'History') === 'Yes' ) {
+                  console.log('Show coin history');
+                  var historyvalues = {"timeout":20000,"immediate":100,"agent":"basilisk","method":"history","vals":{"coin":"" + active_edexcoin + ""}};
+                  //ShowCoinHistory(historyvalues);
+                //}
+              }
+          }
+      }, 1000);
+    }
+
+
     return {
         //main function to initiate the module
         init: function() {
 
           resizeDashboardWindow();
           handle_edex_wallet();
-          //handleWalletWidgetBtns();
+
 
 
           window.onresize = function(event) { resizeDashboardWindow(); };
@@ -302,6 +309,8 @@ var Dashboard = function() {
                 console.log('=> No wallet logged in. No need to run Dashboard JS.');
             } else {
                 handleWalletWidgets();
+                handleWalletWidgetBtns();
+                handleEdexWalletInfo();
                 //TotalFiatValue();
             }
 
diff --git a/index.html b/index.html
index 0e0d407..1e6e3da 100755
--- a/index.html
+++ b/index.html
@@ -479,7 +479,7 @@
             <li role="presentation"><a href="javascript:void(0)" role="menuitem" data-edexcoinmenu="COIN" id="btn_edexcoin_wallet_recieve">Recieve</a></li>
             <li role="presentation"><a href="javascript:void(0)" role="menuitem" data-edexcoinmenu="COIN" id="btn_edexcoin_wallet_transactions">Transactions</a></li>
             <li class="divider" role="presentation"></li>
-            <li role="presentation"><a href="javascript:void(0)" role="menuitem" data-edexcoinmenu="COIN" id="btn_edexcoin_wallet_addcoin">Add Coin</a></li>
+            <li role="presentation"><a href="javascript:void(0)" role="menuitem" data-edexcoinmenu="COIN" id="btn_edexcoin_wallet_addcoin" data-target="#AddCoinDilogModel" data-toggle="modal">Add Coin</a></li>
             <li role="presentation"><a href="javascript:void(0)" role="menuitem" data-edexcoinmenu="COIN" id="btn_edexcoin_wallet_settings">Settings</a></li>
           </ul>
         </div>
@@ -604,7 +604,7 @@
     <!-- START ADD COIN DIV -->
     <div>
     <!-- Modal -->
-      <div class="modal fade modal-3d-sign" id="exampleGrid" aria-hidden="true" aria-labelledby="exampleGrid" role="dialog" tabindex="-1">
+      <div class="modal fade modal-3d-sign" id="AddCoinDilogModel" aria-hidden="true" aria-labelledby="AddCoinDilogModel" role="dialog" tabindex="-1">
         <div class="modal-dialog modal-center modal-lg">
           <div class="modal-content">
             <div class="modal-header bg-orange-a400 wallet-send-header">
@@ -643,15 +643,15 @@
                   </select>
                 </div>
               </div>
-              <!--<div class="col-sm-2" style="text-align: center;">
-              <button type="button" class="btn btn-primary" data-toggle="modal" data-dismiss="modal" id="mdl_addcoin_done_btn" onclick="ExecuteAddCoinFn()">Add Coin</button>
-              </div>-->
+              <div class="col-sm-2" style="text-align: center;">
+              <button type="button" class="btn btn-primary mdl_addcoin_done_btn" data-toggle="modal" data-dismiss="modal" id="mdl_addcoin_done_btn">Add Coin</button>
+              </div>
             </div>
           </div>
         </div>
       </div>
       <!-- End Modal -->
-    <!--<button type="button" class="btn btn-info btn-lg btn-block waves-effect waves-light" data-target="#exampleGrid" data-toggle="modal">Add Coin</button>-->
+    <!--<button type="button" class="btn btn-info btn-lg btn-block waves-effect waves-light" data-target="#AddCoinDilogModel" data-toggle="modal">Add Coin</button>-->
     </div>
     <!-- START ADD COIN DIV -->
     <!-- END DASHBOARD CONTENT BODY -->