Merge branch 'master' of https://github.com/expanse-org/luna-wallet

Author: Muhammad ikram zafar

.idea/workspace.xml

@@ -47,17 +47,17 @@ db.defaults({ accounts: [], contracts: [], tokens: [
         {
             "id": "DrZsGjQIZ",
             "token_address": "0xa887adb722cf15bc1efe3c6a5d879e0482e8d197",
-            "token_name": "Tokan Lab",
-            "token_symbol": "LAB2",
+            "token_name": "Token Lab",
+            "token_symbol": "LAB",
             "tokenType": "erc20",
             "decimal_places": 18,
             "color": "#fa0fa0"
         },
         {
             "id": "6zxjBkREl",
             "token_address": "0x4f5ec5a69dbe12c48ca1edc9c52b1e8896aed932",
-            "token_name": "PEX TOKEN",
-            "token_symbol": "PEX2",
+            "token_name": "Pex Token",
+            "token_symbol": "PEX",
             "tokenType": "erc20",
             "decimal_places": 18,
             "color": "#0297da"

lowdbFunc.js

@@ -82,6 +82,7 @@ const startingGexp = () => {
         // console.log(activeScreen,"activeScreen");
         ipcRenderer.send('startGexp', path);
         ipcRenderer.on('startGexpResponse', (event, res) => {
+            console.log(res,"res");
             if(res){
                 if(os.type() == 'Windows_NT') {
                     setTimeout(function(){

src/common/gexpfunc.js

@@ -166,7 +166,7 @@
             handledelete(contractid) {
                 let contract = db.get('contracts').find({ id: contractid }).value();
                 if(contract){
-                    let con = confirm('You want To Delete: '+contract.contractName+' Contract');
+                    let con = confirm('You want To Delete: '+contract.contract_name+' Contract');
                     if(con){
                         db.get('contracts').remove({ id: contractid}).write();
                         this.$forceUpdate();

src/renderer/components/DasboardComponents/ContractsComponents/Contracts.vue

@@ -172,11 +172,12 @@
                             let contract1 = db.get('contracts').find({
                                 contract_name: this.contractName
                             }).value();
-                            if(contract && contract.length > 0) {
+                            console.log(contract,contract1)
+                            if(contract) {
                                 this.contractAddressError = "Contract Address is already exists";
                                 return false;
                             }
-                            if(contract1 && contract1.length > 0) {
+                            if(contract1) {
                                 this.contractNameError = 'Contract Name is already exists';
                             } else {
                                 try {

src/renderer/components/DasboardComponents/ContractsComponents/WatchContract.vue

@@ -57,23 +57,23 @@
                 }
                 ipcRenderer.on('gexpLogs', (event, res) => {
                     // console.log(res, 'expr------01', this.gexplog.length);
-                    if(this.gexplog[this.gexplog.length-1] === res)
+                    if(this.gexplog[this.gexplog.length-1] === res.replace(/\\n/g, '').substring(4))
                     {
 
-                    } else{
+                    } else if(this.gexplog[this.gexplog.length-1] !== res.replace(/\\n/g, '').substring(4)){
                         if(this.pausegexp){
-                            this.gexplog.push(res);
+                            this.gexplog.push(res.replace(/\\n/g, '').substring(4));
                         }
                     }
                 });
                 ipcRenderer.on('gexpLogsstder', (event, res) => {
-                    // console.log(res, 'exprerrrrr------01', this.gexplog.length);
-                    if(this.gexplog[this.gexplog.length-1] === res)
+                    // console.log(res.replace(/\\n/g, '').substring(4), 'exprerrrrr------01');
+                    if(this.gexplog[this.gexplog.length-1] === res.replace(/\\n/g, '').substring(4))
                     {
 
-                    } else{
+                    } else if(this.gexplog[this.gexplog.length-1] !== res.replace(/\\n/g, '').substring(4)){
                         if(this.pausegexp){
-                            this.gexplog.push(res);
+                            this.gexplog.push(res.replace(/\\n/g, '').substring(4));
                         }
                     }
                 });
@@ -153,6 +153,7 @@
             },
             handlerefresh(){
                 this.pausegexp = true;
+                this.gexplog = [];
                 this.pauseimg = "pause";
             }
         }

src/renderer/components/DasboardComponents/Footer/Footer.vue

@@ -45,7 +45,7 @@
                     <svg xmlns="http://www.w3.org/2000/svg" width="555" height="555" viewBox="0 0 555 555">
                         <path id="Rounded_Rectangle_3" data-name="Rounded Rectangle 3"  d="M177.293,546.928l-47.762-47.762A54.33,54.33,0,0,0,57,426.639L8.072,377.707a27.571,27.571,0,0,1,0-38.991L338.716,8.072a27.571,27.571,0,0,1,38.991,0l48.2,48.2a54.33,54.33,0,0,0,74,74l47.028,47.027a27.571,27.571,0,0,1,0,38.991L216.284,546.928A27.571,27.571,0,0,1,177.293,546.928Zm279.566-317a11.029,11.029,0,0,0,0-15.6L340.665,98.142a11.028,11.028,0,0,0-15.6,0L96.192,327.019a11.028,11.028,0,0,0,0,15.6L212.385,458.808a11.028,11.028,0,0,0,15.6,0ZM217.064,441.652L113.348,337.936a5.515,5.515,0,0,1,0-7.8l216.01-216.01a5.513,5.513,0,0,1,7.8,0L440.872,217.844a5.513,5.513,0,0,1,0,7.8l-216.01,216.01A5.515,5.515,0,0,1,217.064,441.652Z"></path>
                     </svg>
-                    <span>Tokens</span>
+                    <span>TOKENS</span>
                 </button>
             </li>
             <li :class="contractsTab" @click="mainMenu($event, 'contracts')">

src/renderer/components/DasboardComponents/SideBar/SideBar.vue

@@ -347,6 +347,7 @@
                 e.preventDefault();
 
                 console.log(this.accountName,"account");
+                console.log(this.private_key,"private_key");
                 if(this.accountName && this.private_key && this.private_key_password && this.private_key_repassword){
                     if(this.private_key_password.length >= 8){
                         if(this.private_key_password === this.private_key_repassword) {