From 09b4e5416426f34a42a438504847c81c0d2be5c1 Mon Sep 17 00:00:00 2001
From: Satinder Grewal <grewal.satinder@gmail.com>
Date: Fri, 8 Jul 2016 12:45:39 +1200
Subject: [PATCH] fixed some bugs in create new wallet

---
 assets/pages/scripts/login.js | 74 +++++++++++++++++++++++++++++------
 index.html                    |  8 ++--
 2 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/assets/pages/scripts/login.js b/assets/pages/scripts/login.js
index df8ecdf..bbf57ae 100755
--- a/assets/pages/scripts/login.js
+++ b/assets/pages/scripts/login.js
@@ -121,7 +121,7 @@ var Login = function() {
             }
         });
 
-        $('.register-form input').on('change', function() {
+        $('input[name=PassPhraseOptions]').on('change', function() {
             if ( $('input[name=PassPhraseOptions]:checked', '.register-form').val() === 'PassPhraseOptionsIguana' ) {
                 //console.log('PassPhraseOptionsIguana');
                 $('#walletseed').text(PassPhraseGenerator.generatePassPhrase(256))
@@ -166,16 +166,10 @@ var Login = function() {
                     equalTo: "#register_password"
                 },
 
-                backupconfirm: {
-                    required: true
-                }
+                
             },
 
-            messages: { // custom messages for radio buttons and checkboxes
-                tnc: {
-                    required: "Please have taken backup of my Seed and Wallet Password."
-                }
-            },
+            
 
             invalidHandler: function(event, validator) { //display error alert on form submit   
 
@@ -192,8 +186,8 @@ var Login = function() {
             },
 
             errorPlacement: function(error, element) {
-                if (element.attr("name") == "tnc") { // insert checkbox errors after the container                  
-                    error.insertAfter($('#register_tnc_error'));
+                if (element.attr("name") == "backupconfirm") { // insert checkbox errors after the container                  
+                    error.insertAfter($('#register_backupconfirm_error'));
                 } else if (element.closest('.input-icon').size() === 1) {
                     error.insertAfter(element.closest('.input-icon'));
                 } else {
@@ -202,7 +196,63 @@ var Login = function() {
             },
 
             submitHandler: function(form) {
-                form.submit();
+                var IguanaLoginData = {
+                    'handle': $('#wallet-handle').val(),
+                    'password': $('#password').val(),
+                    'timeout': '2592000'
+                }
+                //console.log('== Data Collected ==');
+                //console.log(IguanaLoginData);
+                // Use AJAX to post the object to login user
+                $.ajax({
+                    type: 'GET',
+                    data: IguanaLoginData,
+                    url: 'http://127.0.0.1:7778/api/bitcoinrpc/walletpassphrase',
+                    dataType: 'text',
+                    success: function(data, textStatus, jqXHR) {
+                        var LoginOutput = JSON.parse(data);
+                        var LoginDataToStore = JSON.stringify(data);
+                        sessionStorage.setItem('IguanaActiveAccount', LoginDataToStore);
+                        //console.log(sessionStorage);
+                        console.log('== Data OutPut ==');
+                        console.log(LoginOutput);
+
+                        if (LoginOutput.result === 'success') {
+                            console.log('Success');
+                            //swal("Success", "Login Successfully.", "success");
+                            toastr.success("Login Successfull", "Account Notification")
+
+                            NProgress.done();
+                            $('#wallet-handle').val('')
+                            $('#password').val('')
+                            $('#login-section').hide();
+                            $('body').removeClass( " login" ).addClass( "page-sidebar-closed-hide-logo page-container-bg-solid page-header-fixed" );
+                            $('#wallet-section').fadeIn();
+                        }
+                        else {
+                            // If something goes wrong, alert the error message that our service returned
+                            //swal("Oops...", "Something went wrong!", "error");
+                            toastr.warning("Opps... Something went wrong!", "Account Notification")
+                            console.log(data.statusText);
+                            console.log(textStatus);
+                            console.log(jqXHR);
+
+                            NProgress.done();
+                        }
+                    },
+                    error: function(xhr, textStatus, error) {
+                        console.log('failure');
+                        console.log(xhr.statusText);
+                        console.log(textStatus);
+                        console.log(error);
+                        //swal("Oops...", "Something went wrong!", "error");
+                        toastr.warning("Opps... Something went wrong!", "Account Notification")
+                        
+                        NProgress.done();
+                    }
+                });
+                
+                //form.submit();
             }
         });
 
diff --git a/index.html b/index.html
index 5094da4..28d3197 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@
                 <div class="form-title">
                     <span class="form-title">Create new wallet</span>
                 </div>
-                <p class="hint"> Please select compatible wallet passhprase type: </p>
+                <p class="hint"> Please select compatible wallet seed type: </p>
                 <div class="mt-radio-inline">
                     <label class="mt-radio" style="color: #b7d1e2">
                         <input type="radio" name="PassPhraseOptions" id="PassPhraseOptionsIguana" value="PassPhraseOptionsIguana" checked="">Iguana (256bits)<span></span>
@@ -118,14 +118,14 @@
                 <div class="form-group">
                     <label class="control-label visible-ie8 visible-ie9">Re-type Your Password</label>
                     <input class="form-control placeholder-no-fix" type="password" autocomplete="off" placeholder="Re-type Your Password" name="rpassword" id="rpassword" /> </div>
-                <div class="form-group margin-top-20 margin-bottom-20">
+                <!--<div class="form-group margin-top-20 margin-bottom-20">
                     <label class="mt-checkbox mt-checkbox-outline">
                         <input type="checkbox" name="remember" value="1" />
                         <input type="checkbox" name="backupconfirm" /> I have taken backup of my Seed and Wallet Password
                         <span></span>
                     </label>
-                    <div id="register_tnc_error"> </div>
-                </div>
+                    <div id="register_backupconfirm_error"> </div>
+                </div>-->
                 <div class="form-actions">
                     <button type="button" id="register-back-btn" class="btn btn-default">Back</button>
                     <button type="submit" id="register-submit-btn" class="btn green uppercase pull-right">Submit</button>