Merge branch 'master' into spencer/linting

# Conflicts:
#	package-lock.json
#	src/app/app.component.ts
#	src/app/app.module.ts
#	src/app/shared/shared.module.ts

src/app/shared/shared.module.ts

@@ -11,6 +11,7 @@ import { TokenRatioPipe } from '@app/shared/_pipes/token-ratio.pipe';
 import { ErrorDialogComponent } from '@app/shared/error-dialog/error-dialog.component';
 import { MatDialogModule } from '@angular/material/dialog';
 import { SafePipe } from '@app/shared/_pipes/safe.pipe';
+import { NetworkStatusComponent } from './network-status/network-status.component';
 
 @NgModule({
   declarations: [
@@ -22,6 +23,7 @@ import { SafePipe } from '@app/shared/_pipes/safe.pipe';
     TokenRatioPipe,
     ErrorDialogComponent,
     SafePipe,
+    NetworkStatusComponent
   ],
   exports: [
     TopbarComponent,
@@ -30,6 +32,7 @@ import { SafePipe } from '@app/shared/_pipes/safe.pipe';
     MenuSelectionDirective,
     TokenRatioPipe,
     SafePipe,
+    NetworkStatusComponent
   ],
   imports: [CommonModule, RouterModule, MatIconModule, MatDialogModule],
 })