Merge branch 'master' of https://gitlab.com/epic-tech/explorer2.epic.tech-angular8

src/app/shared/components/siteheader/siteheader.component.html

@@ -13,10 +13,10 @@
 
               <a class="nav-link dropdown-toggle bg-white" href="#" id="navbarDropdown" role="button"
                 data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Beta
+                Testnet
               </a>
               <div class="dropdown-menu net_dropdwn" aria-labelledby="navbarDropdown">
-                <a class="dropdown-item p-2" href="https://explorer2.epic.tech">Alpha</a>
+                <a class="dropdown-item p-2 disabled" href="https://explorer2.epic.tech">Mainnet</a>
               </div>
             </li>
           </ul>

src/app/view/home/graph-list/graph-list.component.ts

@@ -970,6 +970,7 @@ export class GraphListComponent implements OnInit {
       },
       options: null,
     };
+    resolve();
   });
   }
   transactionlinechartFunc(Tdate, Ttotalinput, Ttotalkernal, Ttotaloutput) {