Merge branch 'master' into newsusd

pengiundev · web-flow · commit 283855919514 · 2020-04-24T00:44:42.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -22,4 +22,4 @@ yarn-error.log*
 
 .now
 src/jsons
-src/json
+src/json
diff --git a/src/components/Swap.vue b/src/components/Swap.vue
@@ -338,4 +338,7 @@
         text-align: right;
         font-size: 0.9em;
     }
+    #no-balance {
+        text-align: center;
+    }
 </style>
diff --git a/src/components/root/CombinedStats.vue b/src/components/root/CombinedStats.vue
@@ -261,7 +261,7 @@
 				    	this.bal_infos[key].push(calcBalance)
 				    	total += this.bal_infos.usdt[0] + this.bal_infos.usdt[1] + calcBalance
 				    }
-				    if(key == 'iearn' || key == 'busd' || key == 'susd') {
+				    if(key == 'iearn' || key == 'busd' || key == 'susd' || key == 'susdnew') {
 				    	let slice = decoded.slice(ind, ind+contracts[key].N_COINS*2)
 				    	helpers.chunkArr(slice, 2).map((v, i) => {
 				    		//v is [rate, balance]

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@`
`261`	`261`	`this.bal_infos[key].push(calcBalance)`
`262`	`262`	`total += this.bal_infos.usdt[0] + this.bal_infos.usdt[1] + calcBalance`
`263`	`263`	`}`
`264`		`- if(key == 'iearn' \|\| key == 'busd' \|\| key == 'susd') {`
	`264`	`+ if(key == 'iearn' \|\| key == 'busd' \|\| key == 'susd' \|\| key == 'susdnew') {`
`265`	`265`	`let slice = decoded.slice(ind, ind+contracts[key].N_COINS*2)`
`266`	`266`	`helpers.chunkArr(slice, 2).map((v, i) => {`
`267`	`267`	`//v is [rate, balance]`