Merge branch 'master' into spencer/refactor-cic-dependencies

# Conflicts:
#	package-lock.json
#	package.json
#	src/app/_pgp/pgp-key-store.ts
#	src/app/_pgp/pgp-signer.spec.ts
#	src/app/_pgp/pgp-signer.ts
#	src/app/_services/auth.service.ts
#	src/app/_services/transaction.service.ts
#	src/app/_services/user.service.ts
#	src/app/app.module.ts
#	src/app/pages/pages.module.ts
#	src/app/pages/transactions/transactions.module.ts

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/_/husky.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+if [ -z "$husky_skip_init" ]; then
+  debug () {
+    [ "$HUSKY_DEBUG" = "1" ] && echo "husky (debug) - $1"
+  }
+
+  readonly hook_name="$(basename "$0")"
+  debug "starting $hook_name..."
+
+  if [ "$HUSKY" = "0" ]; then
+    debug "HUSKY env variable is set to 0, skipping hook"
+    exit 0
+  fi
+
+  if [ -f ~/.huskyrc ]; then
+    debug "sourcing ~/.huskyrc"
+    . ~/.huskyrc
+  fi
+
+  export readonly husky_skip_init=1
+  sh -e "$0" "$@"
+  exitCode="$?"
+
+  if [ $exitCode != 0 ]; then
+    echo "husky - $hook_name hook exited with code $exitCode (error)"
+    exit $exitCode
+  fi
+
+  exit 0
+fi

.prettierignore

@@ -0,0 +1,4 @@
+package.json
+package-lock.json
+yarn.lock
+dist

.prettierrc

@@ -0,0 +1,9 @@
+{
+  "useTabs": false,
+  "tabWidth": 2,
+  "singleQuote": true,
+  "printWidth": 100,
+  "semi": true,
+  "bracketSpacing": true,
+  "arrowParens": "always"
+}

README.md

@@ -10,7 +10,9 @@ Run `npm install -g @angular/cli` to install the angular CLI.
 
 ## Development server
 
-Run `npm run start:dev` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+Run  `ng serve` for a local server, `npm run start:dev` for a dev server and  `npm run start:prod` for a prod server..
+
+Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
 
 ## Code scaffolding
 
@@ -22,14 +24,21 @@ Run `ng generate module module-name --route module-name --module app.module` to
 
 ## Build
 
-set you environment variables - set these via environment variables as found in set-env.ts
+Run `ng build` to build the project using local configurations.
-// TODO create a .env file so people don't have to set these one-by-one
+The build artifacts will be stored in the `dist/` directory.
 
-Run `npm run build:dev` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `build:prod` script for a production build.
+Use the `npm run build:dev` script for a development build and the `npm run build:prod` script for a production build.
+
+## PWA
+
+The app supports Progressive Web App capabilities.
+
+Run `npm run start:pwa` to run the project in PWA mode.
+PWA mode works using production configurations.
 
 ## Running unit tests
 
-Run `npm run test:dev` to execute the unit tests via [Karma](https://karma-runner.github.io).
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
 
 ## Running end-to-end tests
 
@@ -37,11 +46,19 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac
 
 ## Environment variables
 
-Environment variables are contained in the `.env` file. See `.env.example` for a template.
+Default environment variables are located in the `src/environments/` directory.
+Custom environment variables are contained in the `.env` file. See `.env.example` for a template.
 
-Default environment variables are set in the `set-env.ts` file.
+Custom environment variables are set via the `set-env.ts` file.
 Once loaded they will be populated in the directory `src/environments/`.
-It contains environment variables for development on `environment.ts` and production on `environment.prod.ts`.
+It contains environment variables for development on `environment.dev.ts` and production on `environment.prod.ts`.
+
+## Code formatting
+
+The system has automated code formatting using [Prettier](https://prettier.io/) and [TsLint](https://palantir.github.io/tslint/).
+To view the styling rules set, check out `.prettierrc` and `tslint.json`.
+
+Run `npm run format:lint` To perform formatting and linting of the codebase.
 
 ## Further help
 

angular.json

@@ -26,7 +26,8 @@
             "aot": true,
             "assets": [
               "src/favicon.ico",
-              "src/assets"
+              "src/assets",
+              "src/manifest.webmanifest"
             ],
             "styles": [
               "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
@@ -65,7 +66,9 @@
                   "maximumWarning": "6kb",
                   "maximumError": "10kb"
                 }
-              ]
+              ],
+              "serviceWorker": true,
+              "ngswConfigPath": "ngsw-config.json"
             },
             "dev": {
               "fileReplacements": [
@@ -107,7 +110,8 @@
             "codeCoverage": true,
             "assets": [
               "src/favicon.ico",
-              "src/assets"
+              "src/assets",
+              "src/manifest.webmanifest"
             ],
             "styles": [
               "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",

ngsw-config.json

@@ -0,0 +1,31 @@
+{
+  "$schema": "./node_modules/@angular/service-worker/config/schema.json",
+  "index": "/index.html",
+  "assetGroups": [
+    {
+      "name": "app",
+      "installMode": "prefetch",
+      "resources": {
+        "files": [
+          "/favicon.ico",
+          "/index.html",
+          "/manifest.webmanifest",
+          "/*.css",
+          "/*.js",
+          "/assets/*.png"
+        ]
+      }
+    },
+    {
+      "name": "assets",
+      "installMode": "lazy",
+      "updateMode": "prefetch",
+      "resources": {
+        "files": [
+          "/assets/**",
+          "/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)"
+        ]
+      }
+    }
+  ]
+}

package.json

@@ -8,10 +8,17 @@
     "start:prod": "ng serve --prod",
     "build:dev": "ng build  -c dev",
     "build:prod": "ng build --prod",
-    "test:dev": "ng test",
+    "start:pwa": "npm run build:prod && http-server -p 4200 dist/cic-staff-client",
+    "test": "ng test",
+    "format:check": "prettier --config ./.prettierrc --list-different \"src/{app,environments,assets}/**/*.{ts,js,json,css,scss}\"",
+    "format:refactor": "prettier --config ./.prettierrc --write \"src/{app,environments,assets}/**/*.{ts,js,json,css,scss}\"",
+    "format:fix": "pretty-quick --staged",
+    "format:lint": "npm run format:refactor && npm run lint",
     "lint": "ng lint",
     "e2e": "ng e2e",
-    "postinstall": "node patch-webpack.js"
+    "precommit": "npm run format:fix && npm run lint",
+    "postinstall": "node patch-webpack.js",
+    "prepare": "husky install"
   },
   "private": true,
   "dependencies": {
@@ -25,13 +32,14 @@
     "@angular/platform-browser": "~10.2.0",
     "@angular/platform-browser-dynamic": "~10.2.0",
     "@angular/router": "~10.2.0",
-    "@cicnet/cic-client-meta": "^0.0.10",
+    "@angular/service-worker": "~10.2.0",
-    "@cicnet/crdt-meta": "^0.0.10",
+    "@cicnet/schemas-data-validator": "*",
-    "@cicnet/schemas-data-validator": "^1.0.0-alpha.3",
     "@popperjs/core": "^2.5.4",
     "bootstrap": "^4.5.3",
     "cic-client": "0.1.4",
+    "cic-client-meta": "0.0.7-alpha.6",
     "ethers": "^5.0.31",
+    "http-server": "^0.12.3",
     "jquery": "^3.5.1",
     "ngx-logger": "^4.2.1",
     "rxjs": "~6.6.0",
@@ -45,12 +53,14 @@
     "@angular-devkit/build-angular": "~0.1002.0",
     "@angular/cli": "~10.2.0",
     "@angular/compiler-cli": "~10.2.0",
+    "@types/datatables.net": "^1.10.19",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/jquery": "^3.5.4",
     "@types/node": "^12.20.6",
     "codelyzer": "^6.0.0",
     "dotenv": "^8.2.0",
+    "husky": "^6.0.0",
     "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",
     "karma": "~5.0.0",
@@ -59,11 +69,21 @@
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "karma-junit-reporter": "^2.0.1",
+    "prettier": "^2.3.0",
+    "pretty-quick": "^3.1.0",
     "protractor": "~7.0.0",
     "secp256k1": "^4.0.2",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
+    "tslint-angular": "^3.0.3",
+    "tslint-config-prettier": "^1.18.0",
+    "tslint-jasmine-rules": "^1.6.1",
     "typescript": "~4.0.2",
     "yargs": "^13.3.2"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "pretty-quick --staged & ng lint"
+    }
   }
 }

set-env.ts

@@ -6,7 +6,7 @@ require('dotenv').config();
 const environment = argv.environment;
 const isProduction = environment === 'prod';
 
-const targetPath = isProduction ? `./src/environments/environment.prod.ts` : `./src/environments/environment.ts`;
+const targetPath = isProduction ? `./src/environments/environment.prod.ts` : `./src/environments/environment.dev.ts`;
 
 const environmentVars = `import {NgxLoggerLevel} from 'ngx-logger';
 
@@ -15,13 +15,13 @@ export const environment = {
   bloxbergChainId: ${process.env.CIC_CHAIN_ID || 8996},
   logLevel: ${process.env.LOG_LEVEL || 'NgxLoggerLevel.ERROR'},
   serverLogLevel: ${process.env.SERVER_LOG_LEVEL || 'NgxLoggerLevel.OFF'},
-  loggingUrl: '${process.env.CIC_LOGGING_URL || 'http://localhost:8000'}',
+  loggingUrl: '${process.env.CIC_LOGGING_URL || ''}',
   cicMetaUrl: '${process.env.CIC_META_URL || 'https://meta.dev.grassrootseconomics.net'}',
-  publicKeysUrl: '${process.env.CIC_KEYS_URL || 'http://localhost:8000/keys.asc'}',
+  publicKeysUrl: '${process.env.CIC_KEYS_URL || 'https://dev.grassrootseconomics.net/.well-known/publickeys'}',
   cicCacheUrl: '${process.env.CIC_CACHE_URL || 'https://cache.dev.grassrootseconomics.net'}',
-  web3Provider: '${process.env.CIC_WEB3_PROVIDER || 'ws://localhost:63546'}',
+  web3Provider: '${process.env.CIC_WEB3_PROVIDER || 'wss://bloxberg-ws.dev.grassrootseconomics.net'}',
   cicUssdUrl: '${process.env.CIC_USSD_URL || 'https://ussd.dev.grassrootseconomics.net'}',
-  registryAddress: '${process.env.CIC_REGISTRY_ADDRESS || '0x6Ca3cB14aA6F761712E1C18646AfBA4d5Ae249E8'}',
+  registryAddress: '${process.env.CIC_REGISTRY_ADDRESS || '0xea6225212005e86a4490018ded4bf37f3e772161'}',
   trustedDeclaratorAddress: '${process.env.CIC_TRUSTED_ADDRESS || '0xEb3907eCad74a0013c259D5874AE7f22DcBcC95C'}'
 };
 `;

src/app/_eth/accountIndex.ts

@@ -1,7 +1,7 @@
 import { environment } from '@src/environments/environment';
 import Web3 from 'web3';
 
-const abi: Array<any> = require('@src/assets/js/block-sync/data/AccountRegistry.json');
+const abi: Array<any> = require('@src/assets/js/block-sync/data/AccountsIndex.json');
 const web3: Web3 = new Web3(environment.web3Provider);
 
 export class AccountIndex {
@@ -20,29 +20,29 @@ export class AccountIndex {
   }
 
   public async totalAccounts(): Promise<number> {
-    return await this.contract.methods.count().call();
+    return await this.contract.methods.entryCount().call();
   }
 
   public async haveAccount(address: string): Promise<boolean> {
-    return await this.contract.methods.accountIndex(address).call() !== 0;
+    return (await this.contract.methods.have(address).call()) !== 0;
   }
 
   public async last(numberOfAccounts: number): Promise<Array<string>> {
     const count: number = await this.totalAccounts();
-    let lowest: number = count - numberOfAccounts - 1;
+    let lowest: number = count - numberOfAccounts;
     if (lowest < 0) {
       lowest = 0;
     }
     const accounts: Array<string> = [];
-    for (let i = count - 1; i > lowest; i--) {
+    for (let i = count; i > lowest; i--) {
-      const account: string = await this.contract.methods.accounts(i).call();
+      const account: string = await this.contract.methods.entry(i).call();
       accounts.push(account);
     }
     return accounts;
   }
 
   public async addToAccountRegistry(address: string): Promise<boolean> {
-    if (!await this.haveAccount(address)) {
+    if (!(await this.haveAccount(address))) {
       return await this.contract.methods.add(address).send({ from: this.signerAddress });
     }
     return true;

src/app/_guards/auth.guard.ts

@@ -1,22 +1,27 @@
 import { Injectable } from '@angular/core';
-import {CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree, Router} from '@angular/router';
+import {
+  CanActivate,
+  ActivatedRouteSnapshot,
+  RouterStateSnapshot,
+  UrlTree,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class AuthGuard implements CanActivate {
-
   constructor(private router: Router) {}
 
   canActivate(
     route: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
+    state: RouterStateSnapshot
+  ): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
     if (localStorage.getItem(btoa('CICADA_PRIVATE_KEY'))) {
       return true;
     }
     this.router.navigate(['/auth']);
     return false;
   }
-
 }

src/app/_guards/role.guard.ts

@@ -1,17 +1,23 @@
 import { Injectable } from '@angular/core';
-import {CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree, Router} from '@angular/router';
+import {
+  CanActivate,
+  ActivatedRouteSnapshot,
+  RouterStateSnapshot,
+  UrlTree,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class RoleGuard implements CanActivate {
-
   constructor(private router: Router) {}
 
   canActivate(
     route: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
+    state: RouterStateSnapshot
+  ): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
     const currentUser = JSON.parse(localStorage.getItem(atob('CICADA_USER')));
     if (currentUser) {
       if (route.data.roles && route.data.roles.indexOf(currentUser.role) === -1) {
@@ -24,5 +30,4 @@ export class RoleGuard implements CanActivate {
     this.router.navigate(['/auth'], { queryParams: { returnUrl: state.url } });
     return false;
   }
-
 }

src/app/_helpers/array-sum.ts

@@ -2,6 +2,4 @@ function arraySum(arr: Array<number>): number {
   return arr.reduce((accumulator, current) => accumulator + current, 0);
 }
 
-export {
+export { arraySum };
-  arraySum
-};

src/app/_helpers/clipboard-copy.ts

@@ -32,7 +32,7 @@ function copyToClipboard(text: any): boolean {
     // copy the text
     document.execCommand('copy');
   } catch (err) {
-    window.alert('Your Browser Doesn\'t support this! Error : ' + err);
+    window.alert('Your Browser Does not support this! Error : ' + err);
     return false;
   }
   // remove the selection range (Chrome throws a warning if we don't.)
@@ -48,6 +48,4 @@ function copyToClipboard(text: any): boolean {
   return true;
 }
 
-export {
+export { copyToClipboard };
-  copyToClipboard
-};

src/app/_helpers/export-csv.ts

@@ -4,7 +4,7 @@ function exportCsv(arrayData: Array<any>, filename: string, delimiter: string =
     return;
   }
   let csv: string = Object.keys(arrayData[0]).join(delimiter) + '\n';
-  arrayData.forEach(obj => {
+  arrayData.forEach((obj) => {
     const row: Array<any> = [];
     for (const key in obj) {
       if (obj.hasOwnProperty(key)) {
@@ -33,6 +33,4 @@ function removeSpecialChar(str: string): string {
   return str.replace(/[^a-zA-Z0-9 ]/g, '');
 }
 
-export {
+export { exportCsv };
-  exportCsv
-};

src/app/_helpers/global-error-handler.ts

@@ -17,10 +17,7 @@ export class HttpError extends Error {
 export class GlobalErrorHandler extends ErrorHandler {
   private sentencesForWarningLogging: Array<string> = [];
 
-  constructor(
+  constructor(private loggingService: LoggingService, private router: Router) {
-    private loggingService: LoggingService,
-    private router: Router
-  ) {
     super();
   }
 
@@ -48,14 +45,30 @@ export class GlobalErrorHandler extends ErrorHandler {
     const route: string = this.router.url;
     if (error instanceof HttpErrorResponse) {
       this.loggingService.sendErrorLevelMessage(
-        `There was an HTTP error on route ${route}.\n${error.message}.\nStatus code: ${(error as HttpErrorResponse).status}`,
+        `There was an HTTP error on route ${route}.\n${error.message}.\nStatus code: ${
-        this, {error});
+          (error as HttpErrorResponse).status
+        }`,
+        this,
+        { error }
+      );
     } else if (error instanceof TypeError) {
-      this.loggingService.sendErrorLevelMessage(`There was a Type error on route ${route}.\n${error.message}`, this, {error});
+      this.loggingService.sendErrorLevelMessage(
+        `There was a Type error on route ${route}.\n${error.message}`,
+        this,
+        { error }
+      );
     } else if (error instanceof Error) {
-      this.loggingService.sendErrorLevelMessage(`There was a general error on route ${route}.\n${error.message}`, this, {error});
+      this.loggingService.sendErrorLevelMessage(
+        `There was a general error on route ${route}.\n${error.message}`,
+        this,
+        { error }
+      );
     } else {
-      this.loggingService.sendErrorLevelMessage(`Nobody threw an error but something happened on route ${route}!`, this, {error});
+      this.loggingService.sendErrorLevelMessage(
+        `Nobody threw an error but something happened on route ${route}!`,
+        this,
+        { error }
+      );
     }
   }
 
@@ -74,3 +87,10 @@ export class GlobalErrorHandler extends ErrorHandler {
     return isWarning;
   }
 }
+
+export function rejectBody(error): { status: any; statusText: any } {
+  return {
+    status: error.status,
+    statusText: error.statusText,
+  };
+}

src/app/_helpers/http-getter.ts

@@ -1,18 +1,17 @@
+import { rejectBody } from '@app/_helpers/global-error-handler';
+
 function HttpGetter(): void {}
 
-HttpGetter.prototype.get = filename => new Promise((resolve, reject) => {
+HttpGetter.prototype.get = (filename) =>
-  const xhr: XMLHttpRequest = new XMLHttpRequest();
+  new Promise((resolve, reject) => {
-  xhr.addEventListener('load', (e) => {
+    fetch(filename).then((response) => {
-    if (xhr.status === 200) {
+      if (response.ok) {
-      resolve(xhr.responseText);
+        resolve(response.json());
-      return;
+      } else {
+        reject(rejectBody(response));
       }
-    reject('failed with status ' + xhr.status + ': ' + xhr.statusText);
+      return;
     });
-  xhr.open('GET', filename);
-  xhr.send();
   });
 
-export {
+export { HttpGetter };
-  HttpGetter
-};

src/app/_helpers/read-csv.ts

@@ -1,13 +1,13 @@
-const objCsv: { size: number, dataFile: any } = {
+const objCsv: { size: number; dataFile: any } = {
   size: 0,
-  dataFile: []
+  dataFile: [],
 };
 
 function readCsv(input: any): Array<any> | void {
   if (input.files && input.files[0]) {
     const reader: FileReader = new FileReader();
     reader.readAsBinaryString(input.files[0]);
-    reader.onload = event => {
+    reader.onload = (event) => {
       objCsv.size = event.total;
       objCsv.dataFile = event.target.result;
       return parseData(objCsv.dataFile);
@@ -18,13 +18,11 @@ function readCsv(input: any): Array<any> | void {
 function parseData(data: any): Array<any> {
   const csvData: Array<any> = [];
   const lineBreak: Array<any> = data.split('\n');
-  lineBreak.forEach(res => {
+  lineBreak.forEach((res) => {
     csvData.push(res.split(','));
   });
   console.table(csvData);
   return csvData;
 }
 
-export {
+export { readCsv };
-  readCsv
-};

src/app/_helpers/schema-validation.ts

@@ -4,7 +4,7 @@ async function personValidation(person: any): Promise<void> {
   const personValidationErrors: any = await validatePerson(person);
 
   if (personValidationErrors) {
-    personValidationErrors.map(error => console.error(`${error.message}`));
+    personValidationErrors.map((error) => console.error(`${error.message}`));
   }
 }
 
@@ -12,11 +12,8 @@ async function vcardValidation(vcard: any): Promise<void> {
   const vcardValidationErrors: any = await validateVcard(vcard);
 
   if (vcardValidationErrors) {
-    vcardValidationErrors.map(error => console.error(`${error.message}`));
+    vcardValidationErrors.map((error) => console.error(`${error.message}`));
   }
 }
 
-export {
+export { personValidation, vcardValidation };
-  personValidation,
-  vcardValidation,
-};

src/app/_interceptors/error.interceptor.spec.ts

@@ -3,11 +3,11 @@ import { TestBed } from '@angular/core/testing';
 import { ErrorInterceptor } from '@app/_interceptors/error.interceptor';
 
 describe('ErrorInterceptor', () => {
-  beforeEach(() => TestBed.configureTestingModule({
+  beforeEach(() =>
-    providers: [
+    TestBed.configureTestingModule({
-      ErrorInterceptor
+      providers: [ErrorInterceptor],
-      ]
+    })
-  }));
+  );
 
   it('should be created', () => {
     const interceptor: ErrorInterceptor = TestBed.inject(ErrorInterceptor);

src/app/_interceptors/error.interceptor.ts

@@ -3,7 +3,8 @@ import {
   HttpRequest,
   HttpHandler,
   HttpEvent,
-  HttpInterceptor, HttpErrorResponse
+  HttpInterceptor,
+  HttpErrorResponse,
 } from '@angular/common/http';
 import { Observable, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';
@@ -12,7 +13,6 @@ import {Router} from '@angular/router';
 
 @Injectable()
 export class ErrorInterceptor implements HttpInterceptor {
-
   constructor(
     private errorDialogService: ErrorDialogService,
     private loggingService: LoggingService,
@@ -29,7 +29,9 @@ export class ErrorInterceptor implements HttpInterceptor {
         } else {
           // The backend returned an unsuccessful response code.
           // The response body may contain clues as to what went wrong.
-          errorMessage = `Backend returned code ${err.status}, body was: ${JSON.stringify(err.error)}`;
+          errorMessage = `Backend returned code ${err.status}, body was: ${JSON.stringify(
+            err.error
+          )}`;
         }
         this.loggingService.sendErrorLevelMessage(errorMessage, this, { error: err });
         switch (err.status) {

src/app/_interceptors/http-config.interceptor.spec.ts

@@ -3,11 +3,11 @@ import { TestBed } from '@angular/core/testing';
 import { HttpConfigInterceptor } from './http-config.interceptor';
 
 describe('HttpConfigInterceptor', () => {
-  beforeEach(() => TestBed.configureTestingModule({
+  beforeEach(() =>
-    providers: [
+    TestBed.configureTestingModule({
-      HttpConfigInterceptor
+      providers: [HttpConfigInterceptor],
-      ]
+    })
-  }));
+  );
 
   it('should be created', () => {
     const interceptor: HttpConfigInterceptor = TestBed.inject(HttpConfigInterceptor);

src/app/_interceptors/http-config.interceptor.ts

@@ -1,15 +1,9 @@
 import { Injectable } from '@angular/core';
-import {
+import { HttpRequest, HttpHandler, HttpEvent, HttpInterceptor } from '@angular/common/http';
-  HttpRequest,
-  HttpHandler,
-  HttpEvent,
-  HttpInterceptor
-} from '@angular/common/http';
 import { Observable } from 'rxjs';
 
 @Injectable()
 export class HttpConfigInterceptor implements HttpInterceptor {
-
   constructor() {}
 
   intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {

src/app/_interceptors/logging.interceptor.spec.ts

@@ -3,11 +3,11 @@ import { TestBed } from '@angular/core/testing';
 import { LoggingInterceptor } from './logging.interceptor';
 
 describe('LoggingInterceptor', () => {
-  beforeEach(() => TestBed.configureTestingModule({
+  beforeEach(() =>
-    providers: [
+    TestBed.configureTestingModule({
-      LoggingInterceptor
+      providers: [LoggingInterceptor],
-      ]
+    })
-  }));
+  );
 
   it('should be created', () => {
     const interceptor: LoggingInterceptor = TestBed.inject(LoggingInterceptor);

src/app/_interceptors/logging.interceptor.ts

@@ -4,7 +4,7 @@ import {
   HttpHandler,
   HttpEvent,
   HttpInterceptor,
-  HttpResponse
+  HttpResponse,
 } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { LoggingService } from '@app/_services/logging.service';
@@ -12,10 +12,7 @@ import {finalize, tap} from 'rxjs/operators';
 
 @Injectable()
 export class LoggingInterceptor implements HttpInterceptor {
-
+  constructor(private loggingService: LoggingService) {}
-  constructor(
-    private loggingService: LoggingService
-  ) {}
 
   intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
     return next.handle(request);

src/app/_models/account.ts

@@ -20,24 +20,34 @@ interface AccountDetails {
   products: string[];
   category?: string;
   vcard: {
-    email: [{
+    email: [
+      {
         value: string;
-    }];
+      }
-    fn: [{
+    ];
+    fn: [
+      {
         value: string;
-    }];
+      }
-    n: [{
+    ];
+    n: [
+      {
         value: string[];
-    }];
+      }
-    tel: [{
+    ];
+    tel: [
+      {
         meta: {
           TYP: string[];
-      },
+        };
         value: string;
-    }],
+      }
-    version: [{
+    ];
+    version: [
+      {
         value: string;
-    }];
+      }
+    ];
   };
 }
 
@@ -75,31 +85,35 @@ const defaultAccount: AccountDetails = {
   },
   products: [],
   vcard: {
-    email: [{
+    email: [
+      {
         value: '',
-    }],
+      },
-    fn: [{
+    ],
+    fn: [
+      {
         value: 'Sarafu Contract',
-    }],
+      },
-    n: [{
+    ],
+    n: [
+      {
         value: ['Sarafu', 'Contract'],
-    }],
+      },
-    tel: [{
+    ],
+    tel: [
+      {
         meta: {
           TYP: [],
         },
         value: '',
-    }],
+      },
-    version: [{
+    ],
+    version: [
+      {
         value: '3.0',
-    }],
+      },
+    ],
   },
 };
 
-export {
+export { AccountDetails, Signature, Meta, MetaResponse, defaultAccount };
-  AccountDetails,
-  Signature,
-  Meta,
-  MetaResponse,
-  defaultAccount
-};

src/app/_models/mappings.ts

@@ -21,9 +21,4 @@ interface AreaType {
   area: Array<string>;
 }
 
-export {
+export { Action, Category, AreaName, AreaType };
-  Action,
-  Category,
-  AreaName,
-  AreaType
-};

src/app/_models/settings.ts

@@ -17,7 +17,4 @@ class W3 {
   provider: any;
 }
 
-export {
+export { Settings, W3 };
-  Settings,
-  W3
-};

src/app/_models/staff.ts

@@ -6,6 +6,4 @@ interface Staff {
   userid: string;
 }
 
-export {
+export { Staff };
-  Staff
-};

src/app/_models/token.ts

@@ -8,12 +8,10 @@ interface Token {
     '0xa686005CE37Dce7738436256982C3903f2E4ea8E'?: {
       weight: string;
       balance: string;
-    }
+    };
   };
   reserveRatio?: string;
   owner?: string;
 }
 
-export {
+export { Token };
-  Token
-};

src/app/_models/transaction.ts

@@ -43,10 +43,4 @@ class Conversion {
   tx: Tx;
 }
 
-export {
+export { BlocksBloom, TxToken, Tx, Transaction, Conversion };
-  BlocksBloom,
-  TxToken,
-  Tx,
-  Transaction,
-  Conversion
-};

src/app/_services/auth.service.ts

@@ -6,14 +6,13 @@ import {LoggingService} from '@app/_services/logging.service';
 import { MutableKeyStore, MutablePgpKeyStore } from '@cicnet/crdt-meta';
 import { ErrorDialogService } from '@app/_services/error-dialog.service';
 import { HttpClient } from '@angular/common/http';
-import {HttpError} from '@app/_helpers/global-error-handler';
+import { HttpError, rejectBody } from '@app/_helpers/global-error-handler';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class AuthService {
   sessionToken: any;
-  sessionLoginCount: number = 0;
   mutableKeyStore: MutableKeyStore;
 
   constructor(
@@ -39,74 +38,75 @@ export class AuthService {
     document.getElementById('state').innerHTML = s;
   }
 
-  getWithToken(): void {
+  getWithToken(): Promise<boolean> {
-    const xhr: XMLHttpRequest = new XMLHttpRequest();
+    return new Promise((resolve, reject) => {
-    xhr.responseType = 'text';
+      const headers = {
-    xhr.open('GET', environment.cicMetaUrl + window.location.search.substring(1));
+        Authorization: 'Bearer ' + this.sessionToken,
-    xhr.setRequestHeader('Authorization', 'Bearer ' + this.sessionToken);
+        'Content-Type': 'application/json;charset=utf-8',
-    xhr.setRequestHeader('Content-Type', 'application/json');
+        'x-cic-automerge': 'none',
-    xhr.setRequestHeader('x-cic-automerge', 'none');
+      };
-    xhr.addEventListener('load', (e) => {
+      const options = {
-      if (xhr.status === 401) {
+        headers,
-        throw new Error('login rejected');
+      };
+      fetch(environment.cicMetaUrl, options).then((response) => {
+        if (response.status === 401) {
+          return reject(rejectBody(response));
         }
-      this.sessionLoginCount++;
+        return resolve(true);
-      this.setState('Click button to log in');
+      });
-      return;
     });
-    xhr.send();
   }
 
   // TODO rename to send signed challenge and set session. Also separate these responsibilities
   sendResponse(hobaResponseEncoded: any): Promise<boolean> {
     return new Promise((resolve, reject) => {
-      const xhr: XMLHttpRequest = new XMLHttpRequest();
+      const headers = {
-      xhr.responseType = 'text';
+        Authorization: 'HOBA ' + hobaResponseEncoded,
-      xhr.open('GET', environment.cicMetaUrl + window.location.search.substring(1));
+        'Content-Type': 'application/json;charset=utf-8',
-      xhr.setRequestHeader('Authorization', 'HOBA ' + hobaResponseEncoded);
+        'x-cic-automerge': 'none',
-      xhr.setRequestHeader('Content-Type', 'application/json');
+      };
-      xhr.setRequestHeader('x-cic-automerge', 'none');
+      const options = {
-      xhr.addEventListener('load', (e) => {
+        headers,
-        if (xhr.status !== 200) {
+      };
-            const error = new HttpError(xhr.statusText, xhr.status);
+      fetch(environment.cicMetaUrl, options).then((response) => {
-            return reject(error);
+        if (response.status === 401) {
+          return reject(rejectBody(response));
         }
-        this.sessionToken = xhr.getResponseHeader('Token');
+        this.sessionToken = response.headers.get('Token');
         sessionStorage.setItem(btoa('CICADA_SESSION_TOKEN'), this.sessionToken);
-        this.sessionLoginCount++;
         this.setState('Click button to log in');
         return resolve(true);
       });
-      xhr.send();
     });
   }
 
-  getChallenge(): void {
+  getChallenge(): Promise<any> {
-    const xhr: XMLHttpRequest = new XMLHttpRequest();
+    return new Promise((resolve, reject) => {
-    xhr.responseType = 'arraybuffer';
+      fetch(environment.cicMetaUrl).then(async (response) => {
-    xhr.open('GET', environment.cicMetaUrl + window.location.search.substring(1));
+        if (response.status === 401) {
-    xhr.onload = async (e) => {
+          const authHeader: string = response.headers.get('WWW-Authenticate');
-      if (xhr.status === 401) {
+          return resolve(hobaParseChallengeHeader(authHeader));
-        const authHeader = xhr.getResponseHeader('WWW-Authenticate');
-        const o = hobaParseChallengeHeader(authHeader);
-        this.loginResponse(o);
         }
-    };
+        if (!response.ok) {
-    xhr.send();
+          return reject(rejectBody(response));
+        }
+      });
+    });
   }
 
-
+  async login(): Promise<boolean> {
-  login(): boolean {
     if (this.sessionToken !== undefined) {
       try {
-        this.getWithToken();
+        const response: boolean = await this.getWithToken();
-        return true;
+        return response === true;
       } catch (e) {
         this.loggingService.sendErrorLevelMessage('Login token failed', this, { error: e });
       }
     } else {
       try {
-        this.getChallenge();
+        const o = await this.getChallenge();
+        const response: boolean = await this.loginResponse(o);
+        return response === true;
       } catch (e) {
         this.loggingService.sendErrorLevelMessage('Login challenge failed', this, { error: e });
       }
@@ -114,31 +114,36 @@ export class AuthService {
     return false;
   }
 
-
+  async loginResponse(o: { challenge: string; realm: any }): Promise<any> {
-  async loginResponse(o: { challenge: string, realm: any }): Promise<any> {
     return new Promise(async (resolve, reject) => {
       try {
-        const r = await signChallenge(o.challenge,
+        const r = await signChallenge(
+          o.challenge,
           o.realm,
           environment.cicMetaUrl,
-                                      this.mutableKeyStore);
+          this.mutableKeyStore
-        const sessionTokenResult: boolean = await this.sendResponse(r);
+        );
+        const response: boolean = await this.sendResponse(r);
+        resolve(response);
       } catch (error) {
         if (error instanceof HttpError) {
           if (error.status === 403) {
-            this.errorDialogService.openDialog({ message: 'You are not authorized to use this system' });
-          }
-          if (error.status === 401) {
             this.errorDialogService.openDialog({
-              message: 'Unable to authenticate with the service. ' +
+              message: 'You are not authorized to use this system',
+            });
+          } else if (error.status === 401) {
+            this.errorDialogService.openDialog({
+              message:
+                'Unable to authenticate with the service. ' +
                 'Please speak with the staff at Grassroots ' +
                 'Economics for requesting access ' +
-                'staff@grassrootseconomics.net.'
+                'staff@grassrootseconomics.net.',
             });
           }
-        }
+        } else {
           // TODO define this error
           this.errorDialogService.openDialog({ message: 'Incorrect key passphrase.' });
+        }
         resolve(false);
       }
     });
@@ -164,7 +169,11 @@ export class AuthService {
       const key = await this.mutableKeyStore.importPrivateKey(privateKeyArmored);
       localStorage.setItem(btoa('CICADA_PRIVATE_KEY'), privateKeyArmored);
     } catch (err) {
-      this.loggingService.sendErrorLevelMessage(`Failed to set key: ${err.message || err.statusText}`, this, {error: err});
+      this.loggingService.sendErrorLevelMessage(
+        `Failed to set key: ${err.message || err.statusText}`,
+        this,
+        { error: err }
+      );
       this.errorDialogService.openDialog({
         message: `Failed to set key: ${err.message || err.statusText}`,
       });
@@ -176,24 +185,26 @@ export class AuthService {
 
   logout(): void {
     sessionStorage.removeItem(btoa('CICADA_SESSION_TOKEN'));
+    localStorage.removeItem(btoa('CICADA_PRIVATE_KEY'));
     this.sessionToken = undefined;
-    window.location.reload(true);
+    window.location.reload();
   }
 
   getTrustedUsers(): any {
     const trustedUsers: Array<any> = [];
-    this.mutableKeyStore.getPublicKeys().forEach(key => trustedUsers.push(key.users[0].userId));
+    this.mutableKeyStore.getPublicKeys().forEach((key) => trustedUsers.push(key.users[0].userId));
     return trustedUsers;
   }
 
   async getPublicKeys(): Promise<any> {
-    return await fetch(environment.publicKeysUrl)
+    return new Promise((resolve, reject) => {
-      .then(res => {
+      fetch(environment.publicKeysUrl).then((res) => {
         if (!res.ok) {
           // TODO does angular recommend an error interface?
-          throw Error(`${res.statusText} - ${res.status}`);
+          return reject(rejectBody(res));
         }
-        return res.text();
+        return resolve(res.text());
+      });
     });
   }
 

src/app/_services/block-sync.service.spec.ts

@@ -9,9 +9,7 @@ describe('BlockSyncService', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      providers: [
+      providers: [{ provide: TransactionService, useClass: TransactionServiceStub }],
-        { provide: TransactionService, useClass: TransactionServiceStub }
-      ]
     });
     service = TestBed.inject(BlockSyncService);
   });

src/app/_services/block-sync.service.ts

@@ -8,7 +8,7 @@ import {LoggingService} from '@app/_services/logging.service';
 import { RegistryService } from '@app/_services/registry.service';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class BlockSyncService {
   readyStateTarget: number = 2;
@@ -17,7 +17,7 @@ export class BlockSyncService {
   constructor(
     private transactionService: TransactionService,
     private loggingService: LoggingService,
-    private registryService: RegistryService,
+    private registryService: RegistryService
   ) {}
 
   blockSync(address: string = null, offset: number = 0, limit: number = 100): void {
@@ -43,7 +43,14 @@ export class BlockSyncService {
     settings.registry.load();
   }
 
-  readyStateProcessor(settings: Settings, bit: number, address: string, offset: number, limit: number): void {
+  readyStateProcessor(
+    settings: Settings,
+    bit: number,
+    address: string,
+    offset: number,
+    limit: number
+  ): void {
+    // tslint:disable-next-line:no-bitwise
     this.readyState |= bit;
     if (this.readyStateTarget === this.readyState && this.readyStateTarget) {
       const wHeadSync: Worker = new Worker('./../assets/js/block-sync/head.js');
@@ -54,11 +61,17 @@ export class BlockSyncService {
         w3_provider: settings.w3.provider,
       });
       if (address === null) {
-        this.transactionService.getAllTransactions(offset, limit).pipe(first()).subscribe(res => {
+        this.transactionService
+          .getAllTransactions(offset, limit)
+          .pipe(first())
+          .subscribe((res) => {
             this.fetcher(settings, res);
           });
       } else {
-        this.transactionService.getAddressTransactions(address, offset, limit).pipe(first()).subscribe(res => {
+        this.transactionService
+          .getAddressTransactions(address, offset, limit)
+          .pipe(first())
+          .subscribe((res) => {
             this.fetcher(settings, res);
           });
       }
@@ -81,7 +94,14 @@ export class BlockSyncService {
     });
   }
 
-  async scan(settings: Settings, lo: number, hi: number, bloomBlockBytes: Uint8Array, bloomBlocktxBytes: Uint8Array, bloomRounds: any): Promise<void> {
+  async scan(
+    settings: Settings,
+    lo: number,
+    hi: number,
+    bloomBlockBytes: Uint8Array,
+    bloomBlocktxBytes: Uint8Array,
+    bloomRounds: any
+  ): Promise<void> {
     const w: Worker = new Worker('./../assets/js/block-sync/ondemand.js');
     w.onmessage = (m) => {
       settings.txHelper.processReceipt(m.data);
@@ -90,10 +110,7 @@ export class BlockSyncService {
       w3_provider: settings.w3.provider,
       lo,
       hi,
-      filters: [
+      filters: [bloomBlockBytes, bloomBlocktxBytes],
-        bloomBlockBytes,
-        bloomBlocktxBytes,
-      ],
       filter_rounds: bloomRounds,
     });
   }
@@ -101,12 +118,19 @@ export class BlockSyncService {
   fetcher(settings: Settings, transactionsInfo: any): void {
     const blockFilterBinstr: string = window.atob(transactionsInfo.block_filter);
     const bOne: Uint8Array = new Uint8Array(blockFilterBinstr.length);
-    bOne.map((e, i, v) => v[i] = blockFilterBinstr.charCodeAt(i));
+    bOne.map((e, i, v) => (v[i] = blockFilterBinstr.charCodeAt(i)));
 
     const blocktxFilterBinstr: string = window.atob(transactionsInfo.blocktx_filter);
     const bTwo: Uint8Array = new Uint8Array(blocktxFilterBinstr.length);
-    bTwo.map((e, i, v) => v[i] = blocktxFilterBinstr.charCodeAt(i));
+    bTwo.map((e, i, v) => (v[i] = blocktxFilterBinstr.charCodeAt(i)));
 
-    settings.scanFilter(settings, transactionsInfo.low, transactionsInfo.high, bOne, bTwo, transactionsInfo.filter_rounds);
+    settings.scanFilter(
+      settings,
+      transactionsInfo.low,
+      transactionsInfo.high,
+      bOne,
+      bTwo,
+      transactionsInfo.filter_rounds
+    );
   }
 }

src/app/_services/error-dialog.service.ts

@@ -3,14 +3,12 @@ import {MatDialog, MatDialogRef} from '@angular/material/dialog';
 import { ErrorDialogComponent } from '@app/shared/error-dialog/error-dialog.component';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class ErrorDialogService {
   public isDialogOpen: boolean = false;
 
-  constructor(
+  constructor(public dialog: MatDialog) {}
-    public dialog: MatDialog,
-  ) { }
 
   openDialog(data): any {
     if (this.isDialogOpen) {
@@ -19,9 +17,9 @@ export class ErrorDialogService {
     this.isDialogOpen = true;
     const dialogRef: MatDialogRef<any> = this.dialog.open(ErrorDialogComponent, {
       width: '300px',
-      data
+      data,
     });
 
-    dialogRef.afterClosed().subscribe(() => this.isDialogOpen = false);
+    dialogRef.afterClosed().subscribe(() => (this.isDialogOpen = false));
   }
 }

src/app/_services/location.service.ts

@@ -5,13 +5,10 @@ import {first} from 'rxjs/operators';
 import { HttpClient } from '@angular/common/http';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class LocationService {
-
+  constructor(private httpClient: HttpClient) {}
-  constructor(
-    private httpClient: HttpClient,
-  ) { }
 
   getAreaNames(): Observable<any> {
     return this.httpClient.get(`${environment.cicMetaUrl}/areanames`);
@@ -26,6 +23,8 @@ export class LocationService {
   }
 
   getAreaTypeByArea(area: string): Observable<any> {
-    return this.httpClient.get(`${environment.cicMetaUrl}/areatypes/${area.toLowerCase()}`).pipe(first());
+    return this.httpClient
+      .get(`${environment.cicMetaUrl}/areatypes/${area.toLowerCase()}`)
+      .pipe(first());
   }
 }

src/app/_services/logging.service.ts

@@ -2,7 +2,7 @@ import {Injectable, isDevMode} from '@angular/core';
 import { NGXLogger } from 'ngx-logger';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class LoggingService {
   env: string;

src/app/_services/registry.service.ts

@@ -5,13 +5,18 @@ import {CICRegistry, FileGetter} from 'cic-client';
 import { HttpGetter } from '@app/_helpers';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class RegistryService {
   web3: Web3 = new Web3(environment.web3Provider);
   fileGetter: FileGetter = new HttpGetter();
-  registry: CICRegistry = new CICRegistry(this.web3, environment.registryAddress, 'CICRegistry', this.fileGetter,
+  registry: CICRegistry = new CICRegistry(
-    ['../../assets/js/block-sync/data']);
+    this.web3,
+    environment.registryAddress,
+    'Registry',
+    this.fileGetter,
+    ['../../assets/js/block-sync/data']
+  );
 
   constructor() {
     this.registry.declaratorHelper.addTrust(environment.trustedDeclaratorAddress);

src/app/_services/token.service.ts

@@ -7,21 +7,20 @@ import {HttpClient} from '@angular/common/http';
 import { RegistryService } from '@app/_services/registry.service';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class TokenService {
   registry: CICRegistry;
   tokenRegistry: TokenRegistry;
   LoadEvent: EventEmitter<number> = new EventEmitter<number>();
 
-  constructor(
+  constructor(private httpClient: HttpClient, private registryService: RegistryService) {
-    private httpClient: HttpClient,
-    private registryService: RegistryService,
-  ) {
     this.registry = registryService.getRegistry();
     this.registry.load();
     this.registry.onload = async (address: string): Promise<void> => {
-      this.tokenRegistry = new TokenRegistry(await this.registry.getContractAddressByName('TokenRegistry'));
+      this.tokenRegistry = new TokenRegistry(
+        await this.registry.getContractAddressByName('TokenRegistry')
+      );
       this.LoadEvent.next(Date.now());
     };
   }

src/app/_services/transaction.service.spec.ts

@@ -11,7 +11,7 @@ describe('TransactionService', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule]
+      imports: [HttpClientTestingModule],
     });
     httpClient = TestBed.inject(HttpClient);
     httpTestingController = TestBed.inject(HttpTestingController);

src/app/_services/transaction.service.ts

@@ -21,7 +21,7 @@ import Web3 from 'web3';
 const vCard = require('vcard-parser');
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class TransactionService {
   transactions: any[] = [];
@@ -36,7 +36,7 @@ export class TransactionService {
     private authService: AuthService,
     private userService: UserService,
     private loggingService: LoggingService,
-    private registryService: RegistryService,
+    private registryService: RegistryService
   ) {
     this.web3 = this.registryService.getWeb3();
     this.registry = registryService.getRegistry();
@@ -52,36 +52,58 @@ export class TransactionService {
   }
 
   async setTransaction(transaction, cacheSize: number): Promise<void> {
-    if (this.transactions.find(cachedTx => cachedTx.tx.txHash === transaction.tx.txHash)) { return; }
+    if (this.transactions.find((cachedTx) => cachedTx.tx.txHash === transaction.tx.txHash)) {
+      return;
+    }
     transaction.value = Number(transaction.value);
     transaction.type = 'transaction';
     try {
-      this.userService.getAccountDetailsFromMeta(await User.toKey(transaction.from)).pipe(first()).subscribe((res) => {
+      this.userService
+        .getAccountDetailsFromMeta(await User.toKey(transaction.from))
+        .pipe(first())
+        .subscribe(
+          (res) => {
             transaction.sender = this.getAccountInfo(res.body);
-      }, error => {
+          },
+          (error) => {
             transaction.sender = defaultAccount;
-      });
+          }
-      this.userService.getAccountDetailsFromMeta(await User.toKey(transaction.to)).pipe(first()).subscribe((res) => {
+        );
+      this.userService
+        .getAccountDetailsFromMeta(await User.toKey(transaction.to))
+        .pipe(first())
+        .subscribe(
+          (res) => {
             transaction.recipient = this.getAccountInfo(res.body);
-      }, error => {
+          },
+          (error) => {
             transaction.recipient = defaultAccount;
-      });
+          }
+        );
     } finally {
       this.addTransaction(transaction, cacheSize);
     }
   }
 
   async setConversion(conversion, cacheSize): Promise<void> {
-    if (this.transactions.find(cachedTx => cachedTx.tx.txHash === conversion.tx.txHash)) { return; }
+    if (this.transactions.find((cachedTx) => cachedTx.tx.txHash === conversion.tx.txHash)) {
+      return;
+    }
     conversion.type = 'conversion';
     conversion.fromValue = Number(conversion.fromValue);
     conversion.toValue = Number(conversion.toValue);
     try {
-      this.userService.getAccountDetailsFromMeta(await User.toKey(conversion.trader)).pipe(first()).subscribe((res) => {
+      this.userService
+        .getAccountDetailsFromMeta(await User.toKey(conversion.trader))
+        .pipe(first())
+        .subscribe(
+          (res) => {
             conversion.sender = conversion.recipient = this.getAccountInfo(res.body);
-      }, error => {
+          },
+          (error) => {
             conversion.sender = conversion.recipient = defaultAccount;
-      });
+          }
+        );
     } finally {
       this.addTransaction(conversion, cacheSize);
     }
@@ -101,19 +123,29 @@ export class TransactionService {
   }
 
   getAccountInfo(account: string): any {
-    let accountInfo = Envelope.fromJSON(JSON.stringify(account)).unwrap().m.data;
+    const accountInfo = Envelope.fromJSON(JSON.stringify(account)).unwrap().m.data;
     accountInfo.vcard = vCard.parse(atob(accountInfo.vcard));
     return accountInfo;
   }
 
-  async transferRequest(tokenAddress: string, senderAddress: string, recipientAddress: string, value: number): Promise<any> {
+  async transferRequest(
-    const transferAuthAddress = await this.registry.getContractAddressByName('TransferAuthorization');
+    tokenAddress: string,
+    senderAddress: string,
+    recipientAddress: string,
+    value: number
+  ): Promise<any> {
+    const transferAuthAddress = await this.registry.getContractAddressByName(
+      'TransferAuthorization'
+    );
     const hashFunction = new Keccak(256);
     hashFunction.update('createRequest(address,address,address,uint256)');
     const hash = hashFunction.digest();
     const methodSignature = hash.toString('hex').substring(0, 8);
     const abiCoder = new utils.AbiCoder();
-    const abi = await abiCoder.encode(['address', 'address', 'address', 'uint256'], [senderAddress, recipientAddress, tokenAddress, value]);
+    const abi = await abiCoder.encode(
+      ['address', 'address', 'address', 'uint256'],
+      [senderAddress, recipientAddress, tokenAddress, value]
+    );
     const data = fromHex(methodSignature + strip0x(abi));
     const tx = new Tx(environment.bloxbergChainId);
     tx.nonce = await this.web3.eth.getTransactionCount(senderAddress);

src/app/_services/user.service.spec.ts

@@ -11,7 +11,7 @@ describe('UserService', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule]
+      imports: [HttpClientTestingModule],
     });
     httpClient = TestBed.inject(HttpClient);
     httpTestingController = TestBed.inject(HttpTestingController);
@@ -34,7 +34,7 @@ describe('UserService', () => {
       failedPinAttempts: 1,
       status: 'approved',
       bio: 'Bodaboda',
-        gender: 'male'
+      gender: 'male',
     });
   });
 
@@ -48,7 +48,7 @@ describe('UserService', () => {
       user: 'Tom',
       role: 'enroller',
       action: 'Disburse RSV 100',
-      approval: false
+      approval: false,
     });
   });
 
@@ -63,7 +63,7 @@ describe('UserService', () => {
       user: 'Tom',
       role: 'enroller',
       action: 'Disburse RSV 100',
-      approval: true
+      approval: true,
     });
   });
 
@@ -74,7 +74,7 @@ describe('UserService', () => {
       user: 'Christine',
       role: 'admin',
       action: 'Change user phone number',
-      approval: false
+      approval: false,
     });
   });
 });

src/app/_services/user.service.ts

@@ -17,7 +17,7 @@ import {add0x} from '@src/assets/js/ethtx/dist/hex';
 const vCard = require('vcard-parser');
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class UserService {
   headers: HttpHeaders = new HttpHeaders({ 'x-cic-automerge': 'client' });
@@ -26,7 +26,9 @@ export class UserService {
   registry: CICRegistry;
 
   accounts: Array<AccountDetails> = [];
-  private accountsList: BehaviorSubject<Array<AccountDetails>> = new BehaviorSubject<Array<AccountDetails>>(this.accounts);
+  private accountsList: BehaviorSubject<Array<AccountDetails>> = new BehaviorSubject<
+    Array<AccountDetails>
+  >(this.accounts);
   accountsSubject: Observable<Array<AccountDetails>> = this.accountsList.asObservable();
 
   actions: Array<any> = [];
@@ -38,7 +40,7 @@ export class UserService {
     private loggingService: LoggingService,
     private tokenService: TokenService,
     private registryService: RegistryService,
-    private authService: AuthService,
+    private authService: AuthService
   ) {
     this.authService.init().then(() => {
       this.keystore = authService.mutableKeyStore;
@@ -62,16 +64,26 @@ export class UserService {
     return this.httpClient.get(`${environment.cicUssdUrl}/accounts/locked/${offset}/${limit}`);
   }
 
-  async changeAccountInfo(address: string, name: string, phoneNumber: string, age: string, type: string, bio: string, gender: string,
+  async changeAccountInfo(
-                          businessCategory: string, userLocation: string, location: string, locationType: string
+    address: string,
+    name: string,
+    phoneNumber: string,
+    age: string,
+    type: string,
+    bio: string,
+    gender: string,
+    businessCategory: string,
+    userLocation: string,
+    location: string,
+    locationType: string
   ): Promise<any> {
     const accountInfo: any = {
       vcard: {
         fn: [{}],
         n: [{}],
-        tel: [{}]
+        tel: [{}],
       },
-      location: {}
+      location: {},
     };
     accountInfo.vcard.fn[0].value = name;
     accountInfo.vcard.n[0].value = name.split(' ');
@@ -87,33 +99,52 @@ export class UserService {
     await vcardValidation(accountInfo.vcard);
     accountInfo.vcard = btoa(vCard.generate(accountInfo.vcard));
     const accountKey: string = await User.toKey(address);
-    this.getAccountDetailsFromMeta(accountKey).pipe(first()).subscribe(async res => {
+    this.getAccountDetailsFromMeta(accountKey)
+      .pipe(first())
+      .subscribe(
+        async (res) => {
           const syncableAccount: Syncable = Envelope.fromJSON(JSON.stringify(res)).unwrap();
           const update: Array<ArgPair> = [];
-      for (const prop in accountInfo) {
+          for (const prop of Object.keys(accountInfo)) {
             update.push(new ArgPair(prop, accountInfo[prop]));
           }
           syncableAccount.update(update, 'client-branch');
           await personValidation(syncableAccount.m.data);
           await this.updateMeta(syncableAccount, accountKey, this.headers);
-    }, async error => {
+        },
-      this.loggingService.sendErrorLevelMessage('Can\'t find account info in meta service', this, {error});
+        async (error) => {
+          this.loggingService.sendErrorLevelMessage(
+            'Cannot find account info in meta service',
+            this,
+            { error }
+          );
           const syncableAccount: Syncable = new Syncable(accountKey, accountInfo);
           await this.updateMeta(syncableAccount, accountKey, this.headers);
-    });
+        }
+      );
     return accountKey;
   }
 
-  async updateMeta(syncableAccount: Syncable, accountKey: string, headers: HttpHeaders): Promise<any> {
+  async updateMeta(
+    syncableAccount: Syncable,
+    accountKey: string,
+    headers: HttpHeaders
+  ): Promise<any> {
     const envelope: Envelope = await this.wrap(syncableAccount, this.signer);
     const reqBody: string = envelope.toJSON();
-    this.httpClient.put(`${environment.cicMetaUrl}/${accountKey}`, reqBody , { headers }).pipe(first()).subscribe(res => {
+    this.httpClient
+      .put(`${environment.cicMetaUrl}/${accountKey}`, reqBody, { headers })
+      .pipe(first())
+      .subscribe((res) => {
         this.loggingService.sendInfoLevelMessage(`Response: ${res}`);
       });
   }
 
   getActions(): void {
-    this.httpClient.get(`${environment.cicCacheUrl}/actions`).pipe(first()).subscribe(res => this.actionsList.next(res));
+    this.httpClient
+      .get(`${environment.cicCacheUrl}/actions`)
+      .pipe(first())
+      .subscribe((res) => this.actionsList.next(res));
   }
 
   getActionById(id: string): Observable<any> {
@@ -148,22 +179,33 @@ export class UserService {
 
   async loadAccounts(limit: number = 100, offset: number = 0): Promise<void> {
     this.resetAccountsList();
-    const accountIndexAddress: string = await this.registry.getContractAddressByName('AccountRegistry');
+    const accountIndexAddress: string = await this.registry.getContractAddressByName(
+      'AccountRegistry'
+    );
     const accountIndexQuery = new AccountIndex(accountIndexAddress);
-    const accountAddresses: Array<string> = await accountIndexQuery.last(await accountIndexQuery.totalAccounts());
+    const accountAddresses: Array<string> = await accountIndexQuery.last(
+      await accountIndexQuery.totalAccounts()
+    );
     this.loggingService.sendInfoLevelMessage(accountAddresses);
     for (const accountAddress of accountAddresses.slice(offset, offset + limit)) {
       await this.getAccountByAddress(accountAddress, limit);
     }
   }
 
-  async getAccountByAddress(accountAddress: string, limit: number = 100): Promise<Observable<AccountDetails>> {
+  async getAccountByAddress(
-    let accountSubject: Subject<any> = new Subject<any>();
+    accountAddress: string,
-    this.getAccountDetailsFromMeta(await User.toKey(add0x(accountAddress))).pipe(first()).subscribe(async res => {
+    limit: number = 100
+  ): Promise<Observable<AccountDetails>> {
+    const accountSubject: Subject<any> = new Subject<any>();
+    this.getAccountDetailsFromMeta(await User.toKey(add0x(accountAddress)))
+      .pipe(first())
+      .subscribe(async (res) => {
         const account: Syncable = Envelope.fromJSON(JSON.stringify(res)).unwrap();
         const accountInfo = account.m.data;
         await personValidation(accountInfo);
-      accountInfo.balance = await this.tokenService.getTokenBalance(accountInfo.identities.evm[`bloxberg:${environment.bloxbergChainId}`][0]);
+        accountInfo.balance = await this.tokenService.getTokenBalance(
+          accountInfo.identities.evm[`bloxberg:${environment.bloxbergChainId}`][0]
+        );
         accountInfo.vcard = vCard.parse(atob(accountInfo.vcard));
         await vcardValidation(accountInfo.vcard);
         this.accounts.unshift(accountInfo);
@@ -176,13 +218,18 @@ export class UserService {
     return accountSubject.asObservable();
   }
 
-  async getAccountByPhone(phoneNumber: string, limit: number = 100): Promise<Observable<AccountDetails>> {
+  async getAccountByPhone(
-    let accountSubject: Subject<any> = new Subject<any>();
+    phoneNumber: string,
-    this.getAccountDetailsFromMeta(await Phone.toKey(phoneNumber)).pipe(first()).subscribe(async res => {
+    limit: number = 100
+  ): Promise<Observable<AccountDetails>> {
+    const accountSubject: Subject<any> = new Subject<any>();
+    this.getAccountDetailsFromMeta(await Phone.toKey(phoneNumber))
+      .pipe(first())
+      .subscribe(async (res) => {
         const response: Syncable = Envelope.fromJSON(JSON.stringify(res)).unwrap();
         const address: string = response.m.data;
         const account: Observable<AccountDetails> = await this.getAccountByAddress(address, limit);
-      account.subscribe(result => {
+        account.subscribe((result) => {
           accountSubject.next(result);
         });
       });
@@ -194,7 +241,9 @@ export class UserService {
     this.accountsList.next(this.accounts);
   }
 
-  searchAccountByName(name: string): any { return; }
+  searchAccountByName(name: string): any {
+    return;
+  }
 
   getCategories(): Observable<any> {
     return this.httpClient.get(`${environment.cicMetaUrl}/categories`);

src/app/app-routing.module.ts

@@ -3,15 +3,22 @@ import {Routes, RouterModule, PreloadAllModules} from '@angular/router';
 import { AuthGuard } from '@app/_guards';
 
 const routes: Routes = [
-  { path: 'auth', loadChildren: () => import('@app/auth/auth.module').then(m => m.AuthModule) },
+  { path: 'auth', loadChildren: () => import('@app/auth/auth.module').then((m) => m.AuthModule) },
-  { path: '', loadChildren: () => import('@pages/pages.module').then(m => m.PagesModule), canActivate: [AuthGuard] },
+  {
-  { path: '**', redirectTo: '', pathMatch: 'full' }
+    path: '',
+    loadChildren: () => import('@pages/pages.module').then((m) => m.PagesModule),
+    canActivate: [AuthGuard],
+  },
+  { path: '**', redirectTo: '', pathMatch: 'full' },
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes, {
+  imports: [
-    preloadingStrategy: PreloadAllModules
+    RouterModule.forRoot(routes, {
-  })],
+      preloadingStrategy: PreloadAllModules,
-  exports: [RouterModule]
+      useHash: true,
+    }),
+  ],
+  exports: [RouterModule],
 })
 export class AppRoutingModule {}

src/app/app.component.html

@@ -1 +1,2 @@
+<app-network-status></app-network-status>
 <router-outlet (activate)="onResize(mediaQuery)"></router-outlet>

src/app/app.component.spec.ts

@@ -2,23 +2,19 @@ import { TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { AppComponent } from '@app/app.component';
 import { TransactionService } from '@app/_services';
-import {FooterStubComponent, SidebarStubComponent, TopbarStubComponent, TransactionServiceStub} from '@src/testing';
+import {
+  FooterStubComponent,
+  SidebarStubComponent,
+  TopbarStubComponent,
+  TransactionServiceStub,
+} from '@src/testing';
 
 describe('AppComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [
+      imports: [RouterTestingModule],
-        RouterTestingModule
+      declarations: [AppComponent, FooterStubComponent, SidebarStubComponent, TopbarStubComponent],
-      ],
+      providers: [{ provide: TransactionService, useClass: TransactionServiceStub }],
-      declarations: [
-        AppComponent,
-        FooterStubComponent,
-        SidebarStubComponent,
-        TopbarStubComponent
-      ],
-      providers: [
-        { provide: TransactionService, useClass: TransactionServiceStub }
-      ]
     }).compileComponents();
   });
 

src/app/app.component.ts

@@ -1,14 +1,20 @@
-import {ChangeDetectionStrategy, Component, HostListener} from '@angular/core';
+import { ChangeDetectionStrategy, Component, HostListener, OnInit } from '@angular/core';
-import {AuthService, ErrorDialogService, LoggingService, TransactionService} from '@app/_services';
+import {
+  AuthService,
+  ErrorDialogService,
+  LoggingService,
+  TransactionService,
+} from '@app/_services';
 import { catchError } from 'rxjs/operators';
+import { SwUpdate } from '@angular/service-worker';
 
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class AppComponent {
+export class AppComponent implements OnInit {
   title = 'CICADA';
   readyStateTarget: number = 3;
   readyState: number = 0;
@@ -18,7 +24,8 @@ export class AppComponent {
     private authService: AuthService,
     private transactionService: TransactionService,
     private loggingService: LoggingService,
-    private errorDialogService: ErrorDialogService
+    private errorDialogService: ErrorDialogService,
+    private swUpdate: SwUpdate
   ) {
     (async () => {
       try {
@@ -31,14 +38,26 @@ export class AppComponent {
         const publicKeys = await this.authService.getPublicKeys();
         await this.authService.mutableKeyStore.importPublicKey(publicKeys);
       } catch (error) {
-        this.errorDialogService.openDialog({message: 'Trusted keys endpoint can\'t be reached. Please try again later.'});
+        this.errorDialogService.openDialog({
+          message: 'Trusted keys endpoint cannot be reached. Please try again later.',
+        });
         // TODO do something to halt user progress...show a sad cicada page 🦗?
       }
     })();
-    this.mediaQuery.addListener(this.onResize);
+    this.mediaQuery.addEventListener('change', this.onResize);
     this.onResize(this.mediaQuery);
   }
 
+  ngOnInit(): void {
+    if (!this.swUpdate.isEnabled) {
+      this.swUpdate.available.subscribe(() => {
+        if (confirm('New Version available. Load New Version?')) {
+          window.location.reload();
+        }
+      });
+    }
+  }
+
   // Load resize
   onResize(e): void {
     const sidebar: HTMLElement = document.getElementById('sidebar');

src/app/app.module.ts

@@ -5,10 +5,7 @@ import {AppRoutingModule} from '@app/app-routing.module';
 import { AppComponent } from '@app/app.component';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
-import {
+import { GlobalErrorHandler, MockBackendProvider } from '@app/_helpers';
-  GlobalErrorHandler,
-  MockBackendProvider,
-} from '@app/_helpers';
 import { SharedModule } from '@app/shared/shared.module';
 import { MatTableModule } from '@angular/material/table';
 import { AuthGuard } from '@app/_guards';
@@ -16,11 +13,10 @@ import {LoggerModule} from 'ngx-logger';
 import { environment } from '@src/environments/environment';
 import { ErrorInterceptor, HttpConfigInterceptor, LoggingInterceptor } from '@app/_interceptors';
 import { MutablePgpKeyStore } from '@cicnet/crdt-meta';
+import { ServiceWorkerModule } from '@angular/service-worker';
 
 @NgModule({
-  declarations: [
+  declarations: [AppComponent],
-    AppComponent
-  ],
   imports: [
     BrowserModule,
     AppRoutingModule,
@@ -32,8 +28,9 @@ import {MutablePgpKeyStore} from '@cicnet/crdt-meta';
       level: environment.logLevel,
       serverLogLevel: environment.serverLogLevel,
       serverLoggingUrl: `${environment.loggingUrl}/api/logs/`,
-      disableConsoleLogging: false
+      disableConsoleLogging: false,
-    })
+    }),
+    ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production }),
   ],
   providers: [
     AuthGuard,
@@ -45,6 +42,6 @@ import {MutablePgpKeyStore} from '@cicnet/crdt-meta';
     { provide: HTTP_INTERCEPTORS, useClass: ErrorInterceptor, multi: true },
     { provide: HTTP_INTERCEPTORS, useClass: LoggingInterceptor, multi: true },
   ],
-  bootstrap: [AppComponent]
+  bootstrap: [AppComponent],
 })
 export class AppModule {}

src/app/auth/_directives/password-toggle.directive.spec.ts

@@ -1,7 +1,9 @@
 import { PasswordToggleDirective } from '@app/auth/_directives/password-toggle.directive';
 import { ElementRef, Renderer2 } from '@angular/core';
 
+// tslint:disable-next-line:prefer-const
 let elementRef: ElementRef;
+// tslint:disable-next-line:prefer-const
 let renderer: Renderer2;
 
 describe('PasswordToggleDirective', () => {

src/app/auth/_directives/password-toggle.directive.ts

@@ -1,7 +1,7 @@
 import { Directive, ElementRef, Input, Renderer2 } from '@angular/core';
 
 @Directive({
-  selector: '[appPasswordToggle]'
+  selector: '[appPasswordToggle]',
 })
 export class PasswordToggleDirective {
   @Input()
@@ -10,10 +10,7 @@ export class PasswordToggleDirective {
   @Input()
   iconId: string;
 
-  constructor(
+  constructor(private elementRef: ElementRef, private renderer: Renderer2) {
-    private elementRef: ElementRef,
-    private renderer: Renderer2,
-  ) {
     this.renderer.listen(this.elementRef.nativeElement, 'click', () => {
       this.togglePasswordVisibility();
     });

src/app/auth/auth-routing.module.ts

@@ -10,6 +10,6 @@ const routes: Routes = [
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
+  exports: [RouterModule],
 })
 export class AuthRoutingModule {}

src/app/auth/auth.component.spec.ts

@@ -8,9 +8,8 @@ describe('AuthComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ AuthComponent ]
+      declarations: [AuthComponent],
-    })
+    }).compileComponents();
-    .compileComponents();
   });
 
   beforeEach(() => {

src/app/auth/auth.component.ts

@@ -8,7 +8,7 @@ import {Router} from '@angular/router';
   selector: 'app-auth',
   templateUrl: './auth.component.html',
   styleUrls: ['./auth.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AuthComponent implements OnInit {
   keyForm: FormGroup;
@@ -33,12 +33,16 @@ export class AuthComponent implements OnInit {
     // }
   }
 
-  get keyFormStub(): any { return this.keyForm.controls; }
+  get keyFormStub(): any {
+    return this.keyForm.controls;
+  }
 
   async onSubmit(): Promise<void> {
     this.submitted = true;
 
-    if (this.keyForm.invalid) { return; }
+    if (this.keyForm.invalid) {
+      return;
+    }
 
     this.loading = true;
     await this.authService.setKey(this.keyFormStub.key.value);

src/app/auth/auth.module.ts

@@ -11,7 +11,6 @@ import {MatInputModule} from '@angular/material/input';
 import { MatButtonModule } from '@angular/material/button';
 import { MatRippleModule } from '@angular/material/core';
 
-
 @NgModule({
   declarations: [AuthComponent, PasswordToggleDirective],
   imports: [
@@ -23,6 +22,6 @@ import {MatRippleModule} from '@angular/material/core';
     MatInputModule,
     MatButtonModule,
     MatRippleModule,
-  ]
+  ],
 })
 export class AuthModule {}

src/app/pages/accounts/account-details/account-details.component.spec.ts

@@ -7,7 +7,13 @@ import {ActivatedRoute} from '@angular/router';
 import { AccountsModule } from '@pages/accounts/accounts.module';
 import { UserService } from '@app/_services';
 import { AppModule } from '@app/app.module';
-import {ActivatedRouteStub, FooterStubComponent, SidebarStubComponent, TopbarStubComponent, UserServiceStub} from '@src/testing';
+import {
+  ActivatedRouteStub,
+  FooterStubComponent,
+  SidebarStubComponent,
+  TopbarStubComponent,
+  UserServiceStub,
+} from '@src/testing';
 
 describe('AccountDetailsComponent', () => {
   let component: AccountDetailsComponent;
@@ -24,19 +30,14 @@ describe('AccountDetailsComponent', () => {
         AccountDetailsComponent,
         FooterStubComponent,
         SidebarStubComponent,
-        TopbarStubComponent
+        TopbarStubComponent,
-      ],
-      imports: [
-        AccountsModule,
-        AppModule,
-        HttpClientTestingModule,
       ],
+      imports: [AccountsModule, AppModule, HttpClientTestingModule],
       providers: [
         { provide: ActivatedRoute, useValue: route },
-        { provide: UserService, useClass: UserServiceStub }
+        { provide: UserService, useClass: UserServiceStub },
-      ]
+      ],
-    })
+    }).compileComponents();
-    .compileComponents();
     httpClient = TestBed.inject(HttpClient);
     httpTestingController = TestBed.inject(HttpTestingController);
   });

src/app/pages/accounts/account-details/account-details.component.ts

@@ -1,8 +1,21 @@
-import {ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, ViewChild} from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
 import { MatTableDataSource } from '@angular/material/table';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatSort } from '@angular/material/sort';
-import {BlockSyncService, LocationService, LoggingService, TokenService, TransactionService, UserService} from '@app/_services';
+import {
+  BlockSyncService,
+  LocationService,
+  LoggingService,
+  TokenService,
+  TransactionService,
+  UserService,
+} from '@app/_services';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { first } from 'rxjs/operators';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
@@ -16,7 +29,7 @@ import {AccountDetails, AreaName, AreaType, Category, Transaction} from '@app/_m
   selector: 'app-account-details',
   templateUrl: './account-details.component.html',
   styleUrls: ['./account-details.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AccountDetailsComponent implements OnInit {
   transactionsDataSource: MatTableDataSource<any>;
@@ -63,7 +76,7 @@ export class AccountDetailsComponent implements OnInit {
     private loggingService: LoggingService,
     private blockSyncService: BlockSyncService,
     private cdr: ChangeDetectorRef,
-    private snackBar: MatSnackBar,
+    private snackBar: MatSnackBar
   ) {
     this.accountInfoForm = this.formBuilder.group({
       name: ['', Validators.required],
@@ -79,8 +92,10 @@ export class AccountDetailsComponent implements OnInit {
     });
     this.route.paramMap.subscribe(async (params: Params) => {
       this.accountAddress = add0x(params.get('id'));
-      this.bloxbergLink = 'https://blockexplorer.bloxberg.org/address/' + this.accountAddress + '/transactions';
+      this.bloxbergLink =
-      (await this.userService.getAccountByAddress(this.accountAddress, 100)).subscribe(async res => {
+        'https://blockexplorer.bloxberg.org/address/' + this.accountAddress + '/transactions';
+      (await this.userService.getAccountByAddress(this.accountAddress, 100)).subscribe(
+        async (res) => {
           if (res !== undefined) {
             this.account = res;
             this.cdr.detectChanges();
@@ -102,26 +117,45 @@ export class AccountDetailsComponent implements OnInit {
           } else {
             alert('Account not found!');
           }
-      });
+        }
+      );
       this.blockSyncService.blockSync(this.accountAddress);
     });
-    this.userService.getCategories().pipe(first()).subscribe(res => this.categories = res);
+    this.userService
-    this.locationService.getAreaNames().pipe(first()).subscribe(res => this.areaNames = res);
+      .getCategories()
-    this.locationService.getAreaTypes().pipe(first()).subscribe(res => this.areaTypes = res);
+      .pipe(first())
-    this.userService.getAccountTypes().pipe(first()).subscribe(res => this.accountTypes = res);
+      .subscribe((res) => (this.categories = res));
-    this.userService.getTransactionTypes().pipe(first()).subscribe(res => this.transactionsTypes = res);
+    this.locationService
-    this.userService.getGenders().pipe(first()).subscribe(res => this.genders = res);
+      .getAreaNames()
+      .pipe(first())
+      .subscribe((res) => (this.areaNames = res));
+    this.locationService
+      .getAreaTypes()
+      .pipe(first())
+      .subscribe((res) => (this.areaTypes = res));
+    this.userService
+      .getAccountTypes()
+      .pipe(first())
+      .subscribe((res) => (this.accountTypes = res));
+    this.userService
+      .getTransactionTypes()
+      .pipe(first())
+      .subscribe((res) => (this.transactionsTypes = res));
+    this.userService
+      .getGenders()
+      .pipe(first())
+      .subscribe((res) => (this.genders = res));
   }
 
   ngOnInit(): void {
-    this.userService.accountsSubject.subscribe(accounts => {
+    this.userService.accountsSubject.subscribe((accounts) => {
       this.userDataSource = new MatTableDataSource<any>(accounts);
       this.userDataSource.paginator = this.userTablePaginator;
       this.userDataSource.sort = this.userTableSort;
       this.accounts = accounts;
     });
 
-    this.transactionService.transactionsSubject.subscribe(transactions => {
+    this.transactionService.transactionsSubject.subscribe((transactions) => {
       this.transactionsDataSource = new MatTableDataSource<any>(transactions);
       this.transactionsDataSource.paginator = this.transactionTablePaginator;
       this.transactionsDataSource.sort = this.transactionTableSort;
@@ -142,14 +176,20 @@ export class AccountDetailsComponent implements OnInit {
   }
 
   viewAccount(account): void {
-    this.router.navigateByUrl(`/accounts/${strip0x(account.identities.evm[`bloxberg:${environment.bloxbergChainId}`][0])}`);
+    this.router.navigateByUrl(
+      `/accounts/${strip0x(account.identities.evm[`bloxberg:${environment.bloxbergChainId}`][0])}`
+    );
   }
 
-  get accountInfoFormStub(): any { return this.accountInfoForm.controls; }
+  get accountInfoFormStub(): any {
+    return this.accountInfoForm.controls;
+  }
 
   async saveInfo(): Promise<void> {
     this.submitted = true;
-    if (this.accountInfoForm.invalid || !confirm('Change user\'s profile information?')) { return; }
+    if (this.accountInfoForm.invalid || !confirm(`Change user's profile information?`)) {
+      return;
+    }
     const accountKey = await this.userService.changeAccountInfo(
       this.accountAddress,
       this.accountInfoFormStub.name.value,
@@ -168,29 +208,38 @@ export class AccountDetailsComponent implements OnInit {
 
   filterAccounts(): void {
     if (this.accountsType === 'all') {
-      this.userService.accountsSubject.subscribe(accounts => {
+      this.userService.accountsSubject.subscribe((accounts) => {
         this.userDataSource.data = accounts;
         this.accounts = accounts;
       });
     } else {
-      this.userDataSource.data = this.accounts.filter(account => account.type === this.accountsType);
+      this.userDataSource.data = this.accounts.filter(
+        (account) => account.type === this.accountsType
+      );
     }
   }
 
   filterTransactions(): void {
     if (this.transactionsType === 'all') {
-      this.transactionService.transactionsSubject.subscribe(transactions => {
+      this.transactionService.transactionsSubject.subscribe((transactions) => {
         this.transactionsDataSource.data = transactions;
         this.transactions = transactions;
       });
     } else {
-      this.transactionsDataSource.data = this.transactions.filter(transaction => transaction.type === this.transactionsType);
+      this.transactionsDataSource.data = this.transactions.filter(
+        (transaction) => transaction.type === this.transactionsType
+      );
     }
   }
 
   resetPin(): void {
-    if (!confirm('Reset user\'s pin?')) { return; }
+    if (!confirm(`Reset user's pin?`)) {
-    this.userService.resetPin(this.account.vcard.tel[0].value).pipe(first()).subscribe(res => {
+      return;
+    }
+    this.userService
+      .resetPin(this.account.vcard.tel[0].value)
+      .pipe(first())
+      .subscribe((res) => {
         this.loggingService.sendInfoLevelMessage(`Response: ${res}`);
       });
   }
@@ -201,7 +250,9 @@ export class AccountDetailsComponent implements OnInit {
 
   copyAddress(): void {
     if (copyToClipboard(this.accountAddress)) {
-      this.snackBar.open(this.accountAddress + ' copied successfully!', 'Close', { duration: 3000 });
+      this.snackBar.open(this.accountAddress + ' copied successfully!', 'Close', {
+        duration: 3000,
+      });
     }
   }
 }

src/app/pages/accounts/account-search/account-search.component.spec.ts

@@ -8,9 +8,8 @@ describe('AccountSearchComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ AccountSearchComponent ]
+      declarations: [AccountSearchComponent],
-    })
+    }).compileComponents();
-    .compileComponents();
   });
 
   beforeEach(() => {

src/app/pages/accounts/account-search/account-search.component.ts

@@ -10,7 +10,7 @@ import {environment} from '@src/environments/environment';
   selector: 'app-account-search',
   templateUrl: './account-search.component.html',
   styleUrls: ['./account-search.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AccountSearchComponent implements OnInit {
   nameSearchForm: FormGroup;
@@ -27,7 +27,7 @@ export class AccountSearchComponent implements OnInit {
   constructor(
     private formBuilder: FormBuilder,
     private userService: UserService,
-    private router: Router,
+    private router: Router
   ) {}
 
   ngOnInit(): void {
@@ -42,13 +42,21 @@ export class AccountSearchComponent implements OnInit {
     });
   }
 
-  get nameSearchFormStub(): any { return this.nameSearchForm.controls; }
+  get nameSearchFormStub(): any {
-  get phoneSearchFormStub(): any { return this.phoneSearchForm.controls; }
+    return this.nameSearchForm.controls;
-  get addressSearchFormStub(): any { return this.addressSearchForm.controls; }
+  }
+  get phoneSearchFormStub(): any {
+    return this.phoneSearchForm.controls;
+  }
+  get addressSearchFormStub(): any {
+    return this.addressSearchForm.controls;
+  }
 
   onNameSearch(): void {
     this.nameSearchSubmitted = true;
-    if (this.nameSearchForm.invalid) { return; }
+    if (this.nameSearchForm.invalid) {
+      return;
+    }
     this.nameSearchLoading = true;
     this.userService.searchAccountByName(this.nameSearchFormStub.name.value);
     this.nameSearchLoading = false;
@@ -56,11 +64,17 @@ export class AccountSearchComponent implements OnInit {
 
   async onPhoneSearch(): Promise<void> {
     this.phoneSearchSubmitted = true;
-    if (this.phoneSearchForm.invalid) { return; }
+    if (this.phoneSearchForm.invalid) {
+      return;
+    }
     this.phoneSearchLoading = true;
-    (await this.userService.getAccountByPhone(this.phoneSearchFormStub.phoneNumber.value, 100)).subscribe(async res => {
+    (
+      await this.userService.getAccountByPhone(this.phoneSearchFormStub.phoneNumber.value, 100)
+    ).subscribe(async (res) => {
       if (res !== undefined) {
-        await this.router.navigateByUrl(`/accounts/${strip0x(res.identities.evm[`bloxberg:${environment.bloxbergChainId}`][0])}`);
+        await this.router.navigateByUrl(
+          `/accounts/${strip0x(res.identities.evm[`bloxberg:${environment.bloxbergChainId}`][0])}`
+        );
       } else {
         alert('Account not found!');
       }
@@ -70,11 +84,17 @@ export class AccountSearchComponent implements OnInit {
 
   async onAddressSearch(): Promise<void> {
     this.addressSearchSubmitted = true;
-    if (this.addressSearchForm.invalid) { return; }
+    if (this.addressSearchForm.invalid) {
+      return;
+    }
     this.addressSearchLoading = true;
-    (await this.userService.getAccountByAddress(this.addressSearchFormStub.address.value, 100)).subscribe(async res => {
+    (
+      await this.userService.getAccountByAddress(this.addressSearchFormStub.address.value, 100)
+    ).subscribe(async (res) => {
       if (res !== undefined) {
-        await this.router.navigateByUrl(`/accounts/${strip0x(res.identities.evm[`bloxberg:${environment.bloxbergChainId}`][0])}`);
+        await this.router.navigateByUrl(
+          `/accounts/${strip0x(res.identities.evm[`bloxberg:${environment.bloxbergChainId}`][0])}`
+        );
       } else {
         alert('Account not found!');
       }

src/app/pages/accounts/accounts-routing.module.ts

@@ -11,11 +11,11 @@ const routes: Routes = [
   { path: 'search', component: AccountSearchComponent },
   // { path: 'create', component: CreateAccountComponent },
   { path: ':id', component: AccountDetailsComponent },
-  { path: '**', redirectTo: '', pathMatch: 'full' }
+  { path: '**', redirectTo: '', pathMatch: 'full' },
 ];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
+  exports: [RouterModule],
 })
 export class AccountsRoutingModule {}

src/app/pages/accounts/accounts.component.spec.ts

@@ -1,7 +1,12 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AccountsComponent } from './accounts.component';
-import {FooterStubComponent, SidebarStubComponent, TopbarStubComponent, UserServiceStub} from '@src/testing';
+import {
+  FooterStubComponent,
+  SidebarStubComponent,
+  TopbarStubComponent,
+  UserServiceStub,
+} from '@src/testing';
 import { AccountsModule } from '@pages/accounts/accounts.module';
 import { AppModule } from '@app/app.module';
 import { HttpClient } from '@angular/common/http';
@@ -20,18 +25,11 @@ describe('AccountsComponent', () => {
         AccountsComponent,
         FooterStubComponent,
         SidebarStubComponent,
-        TopbarStubComponent
+        TopbarStubComponent,
       ],
-      imports: [
+      imports: [AccountsModule, AppModule, HttpClientTestingModule],
-        AccountsModule,
+      providers: [{ provide: UserService, useClass: UserServiceStub }],
-        AppModule,
+    }).compileComponents();
-        HttpClientTestingModule,
-      ],
-      providers: [
-        { provide: UserService, useClass: UserServiceStub }
-      ]
-    })
-    .compileComponents();
     httpClient = TestBed.inject(HttpClient);
     httpTestingController = TestBed.inject(HttpTestingController);
   });

src/app/pages/accounts/accounts.component.ts

@@ -14,7 +14,7 @@ import {AccountDetails} from '@app/_models';
   selector: 'app-accounts',
   templateUrl: './accounts.component.html',
   styleUrls: ['./accounts.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AccountsComponent implements OnInit {
   dataSource: MatTableDataSource<any>;
@@ -32,8 +32,7 @@ export class AccountsComponent implements OnInit {
     private userService: UserService,
     private loggingService: LoggingService,
     private router: Router
-  )
+  ) {
-  {
     (async () => {
       try {
         // TODO it feels like this should be in the onInit handler
@@ -42,11 +41,14 @@ export class AccountsComponent implements OnInit {
         this.loggingService.sendErrorLevelMessage('Failed to load accounts', this, { error });
       }
     })();
-    this.userService.getAccountTypes().pipe(first()).subscribe(res => this.accountTypes = res);
+    this.userService
+      .getAccountTypes()
+      .pipe(first())
+      .subscribe((res) => (this.accountTypes = res));
   }
 
   ngOnInit(): void {
-    this.userService.accountsSubject.subscribe(accounts => {
+    this.userService.accountsSubject.subscribe((accounts) => {
       this.dataSource = new MatTableDataSource<any>(accounts);
       this.dataSource.paginator = this.paginator;
       this.dataSource.sort = this.sort;
@@ -59,17 +61,19 @@ export class AccountsComponent implements OnInit {
   }
 
   async viewAccount(account): Promise<void> {
-    await this.router.navigateByUrl(`/accounts/${strip0x(account.identities.evm[`bloxberg:${environment.bloxbergChainId}`][0])}`);
+    await this.router.navigateByUrl(
+      `/accounts/${strip0x(account.identities.evm[`bloxberg:${environment.bloxbergChainId}`][0])}`
+    );
   }
 
   filterAccounts(): void {
     if (this.accountsType === 'all') {
-      this.userService.accountsSubject.subscribe(accounts => {
+      this.userService.accountsSubject.subscribe((accounts) => {
         this.dataSource.data = accounts;
         this.accounts = accounts;
       });
     } else {
-      this.dataSource.data = this.accounts.filter(account => account.type === this.accountsType);
+      this.dataSource.data = this.accounts.filter((account) => account.type === this.accountsType);
     }
   }
 

src/app/pages/accounts/accounts.module.ts

@@ -24,13 +24,12 @@ import {ReactiveFormsModule} from '@angular/forms';
 import { AccountSearchComponent } from './account-search/account-search.component';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 
-
 @NgModule({
   declarations: [
     AccountsComponent,
     AccountDetailsComponent,
     CreateAccountComponent,
-    AccountSearchComponent
+    AccountSearchComponent,
   ],
   imports: [
     CommonModule,
@@ -52,6 +51,6 @@ import {MatSnackBarModule} from '@angular/material/snack-bar';
     MatProgressSpinnerModule,
     ReactiveFormsModule,
     MatSnackBarModule,
-  ]
+  ],
 })
 export class AccountsModule {}

src/app/pages/accounts/create-account/create-account.component.spec.ts

@@ -5,7 +5,6 @@ import {AccountsModule} from '@pages/accounts/accounts.module';
 import { AppModule } from '@app/app.module';
 import { FooterStubComponent, SidebarStubComponent, TopbarStubComponent } from '@src/testing';
 
-
 describe('CreateAccountComponent', () => {
   let component: CreateAccountComponent;
   let fixture: ComponentFixture<CreateAccountComponent>;
@@ -16,14 +15,10 @@ describe('CreateAccountComponent', () => {
         CreateAccountComponent,
         FooterStubComponent,
         SidebarStubComponent,
-        TopbarStubComponent
+        TopbarStubComponent,
       ],
-      imports: [
+      imports: [AccountsModule, AppModule],
-        AccountsModule,
+    }).compileComponents();
-        AppModule
-      ]
-    })
-    .compileComponents();
   });
 
   beforeEach(() => {

src/app/pages/accounts/create-account/create-account.component.ts

@@ -9,7 +9,7 @@ import {AreaName, Category} from '@app/_models';
   selector: 'app-create-account',
   templateUrl: './create-account.component.html',
   styleUrls: ['./create-account.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CreateAccountComponent implements OnInit {
   createForm: FormGroup;
@@ -37,19 +37,35 @@ export class CreateAccountComponent implements OnInit {
       location: ['', Validators.required],
       gender: ['', Validators.required],
       referrer: ['', Validators.required],
-      businessCategory: ['', Validators.required]
+      businessCategory: ['', Validators.required],
     });
-    this.userService.getCategories().pipe(first()).subscribe(res => this.categories = res);
+    this.userService
-    this.locationService.getAreaNames().pipe(first()).subscribe(res => this.areaNames = res);
+      .getCategories()
-    this.userService.getAccountTypes().pipe(first()).subscribe(res => this.accountTypes = res);
+      .pipe(first())
-    this.userService.getGenders().pipe(first()).subscribe(res => this.genders = res);
+      .subscribe((res) => (this.categories = res));
+    this.locationService
+      .getAreaNames()
+      .pipe(first())
+      .subscribe((res) => (this.areaNames = res));
+    this.userService
+      .getAccountTypes()
+      .pipe(first())
+      .subscribe((res) => (this.accountTypes = res));
+    this.userService
+      .getGenders()
+      .pipe(first())
+      .subscribe((res) => (this.genders = res));
   }
 
-  get createFormStub(): any { return this.createForm.controls; }
+  get createFormStub(): any {
+    return this.createForm.controls;
+  }
 
   onSubmit(): void {
     this.submitted = true;
-    if (this.createForm.invalid || !confirm('Create account?')) { return; }
+    if (this.createForm.invalid || !confirm('Create account?')) {
+      return;
+    }
     this.submitted = false;
   }
 }

src/app/pages/admin/admin-routing.module.ts

@@ -7,6 +7,6 @@ const routes: Routes = [{ path: '', component: AdminComponent }];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
+  exports: [RouterModule],
 })
 export class AdminRoutingModule {}

src/app/pages/admin/admin.component.spec.ts

@@ -4,7 +4,12 @@ import { AdminComponent } from '@pages/admin/admin.component';
 import { HttpClient } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { AdminModule } from '@pages/admin/admin.module';
-import {FooterStubComponent, SidebarStubComponent, TopbarStubComponent, UserServiceStub} from '@src/testing';
+import {
+  FooterStubComponent,
+  SidebarStubComponent,
+  TopbarStubComponent,
+  UserServiceStub,
+} from '@src/testing';
 import { AppModule } from '@app/app.module';
 import { UserService } from '@app/_services';
 
@@ -21,18 +26,11 @@ describe('AdminComponent', () => {
         AdminComponent,
         FooterStubComponent,
         SidebarStubComponent,
-        TopbarStubComponent
+        TopbarStubComponent,
       ],
-      imports: [
+      imports: [AdminModule, AppModule, HttpClientTestingModule],
-        AdminModule,
+      providers: [{ provide: UserService, useClass: UserServiceStub }],
-        AppModule,
+    }).compileComponents();
-        HttpClientTestingModule,
-      ],
-      providers: [
-        { provide: UserService, useClass: UserServiceStub }
-      ]
-    })
-    .compileComponents();
     httpClient = TestBed.inject(HttpClient);
     httpTestingController = TestBed.inject(HttpTestingController);
     userService = new UserServiceStub();
@@ -55,7 +53,7 @@ describe('AdminComponent', () => {
       user: 'Tom',
       role: 'enroller',
       action: 'Disburse RSV 100',
-      approval: false
+      approval: false,
     });
   });
 });

src/app/pages/admin/admin.component.ts

@@ -18,8 +18,8 @@ import {Action} from '../../_models';
       state('collapsed', style({ height: '0px', minHeight: 0, visibility: 'hidden' })),
       state('expanded', style({ height: '*', visibility: 'visible' })),
       transition('expanded <=> collapsed', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)')),
-    ])
+    ]),
-  ]
+  ],
 })
 export class AdminComponent implements OnInit {
   dataSource: MatTableDataSource<any>;
@@ -30,12 +30,9 @@ export class AdminComponent implements OnInit {
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
-  constructor(
+  constructor(private userService: UserService, private loggingService: LoggingService) {
-    private userService: UserService,
-    private loggingService: LoggingService
-  ) {
     this.userService.getActions();
-    this.userService.actionsSubject.subscribe(actions => {
+    this.userService.actionsSubject.subscribe((actions) => {
       this.dataSource = new MatTableDataSource<any>(actions);
       this.dataSource.paginator = this.paginator;
       this.dataSource.sort = this.sort;
@@ -43,8 +40,7 @@ export class AdminComponent implements OnInit {
     });
   }
 
-  ngOnInit(): void {
+  ngOnInit(): void {}
-  }
 
   doFilter(value: string): void {
     this.dataSource.filter = value.trim().toLocaleLowerCase();
@@ -55,14 +51,24 @@ export class AdminComponent implements OnInit {
   }
 
   approveAction(action: any): void {
-    if (!confirm('Approve action?')) { return; }
+    if (!confirm('Approve action?')) {
-    this.userService.approveAction(action.id).pipe(first()).subscribe(res => this.loggingService.sendInfoLevelMessage(res));
+      return;
+    }
+    this.userService
+      .approveAction(action.id)
+      .pipe(first())
+      .subscribe((res) => this.loggingService.sendInfoLevelMessage(res));
     this.userService.getActions();
   }
 
   disapproveAction(action: any): void {
-    if (!confirm('Disapprove action?')) { return; }
+    if (!confirm('Disapprove action?')) {
-    this.userService.revokeAction(action.id).pipe(first()).subscribe(res => this.loggingService.sendInfoLevelMessage(res));
+      return;
+    }
+    this.userService
+      .revokeAction(action.id)
+      .pipe(first())
+      .subscribe((res) => this.loggingService.sendInfoLevelMessage(res));
     this.userService.getActions();
   }
 

src/app/pages/admin/admin.module.ts

@@ -14,7 +14,6 @@ import {MatPaginatorModule} from '@angular/material/paginator';
 import { MatButtonModule } from '@angular/material/button';
 import { MatRippleModule } from '@angular/material/core';
 
-
 @NgModule({
   declarations: [AdminComponent],
   imports: [
@@ -29,7 +28,7 @@ import {MatRippleModule} from '@angular/material/core';
     MatSortModule,
     MatPaginatorModule,
     MatButtonModule,
-        MatRippleModule
+    MatRippleModule,
-    ]
+  ],
 })
 export class AdminModule {}

src/app/pages/pages-routing.module.ts

@@ -5,16 +5,32 @@ import { PagesComponent } from './pages.component';
 
 const routes: Routes = [
   { path: 'home', component: PagesComponent },
-  { path: 'tx', loadChildren: () => import('@pages/transactions/transactions.module').then(m => m.TransactionsModule) },
+  {
-  { path: 'settings', loadChildren: () => import('@pages/settings/settings.module').then(m => m.SettingsModule) },
+    path: 'tx',
-  { path: 'accounts', loadChildren: () => import('@pages/accounts/accounts.module').then(m => m.AccountsModule) },
+    loadChildren: () =>
-  { path: 'tokens', loadChildren: () => import('@pages/tokens/tokens.module').then(m => m.TokensModule) },
+      import('@pages/transactions/transactions.module').then((m) => m.TransactionsModule),
-  { path: 'admin', loadChildren: () => import('@pages/admin/admin.module').then(m => m.AdminModule) },
+  },
-  { path: '**', redirectTo: 'home', pathMatch: 'full'}
+  {
+    path: 'settings',
+    loadChildren: () => import('@pages/settings/settings.module').then((m) => m.SettingsModule),
+  },
+  {
+    path: 'accounts',
+    loadChildren: () => import('@pages/accounts/accounts.module').then((m) => m.AccountsModule),
+  },
+  {
+    path: 'tokens',
+    loadChildren: () => import('@pages/tokens/tokens.module').then((m) => m.TokensModule),
+  },
+  {
+    path: 'admin',
+    loadChildren: () => import('@pages/admin/admin.module').then((m) => m.AdminModule),
+  },
+  { path: '**', redirectTo: 'home', pathMatch: 'full' },
 ];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
+  exports: [RouterModule],
 })
 export class PagesRoutingModule {}

src/app/pages/pages.component.spec.ts

@@ -8,9 +8,8 @@ describe('PagesComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ PagesComponent ]
+      declarations: [PagesComponent],
-    })
+    }).compileComponents();
-    .compileComponents();
   });
 
   beforeEach(() => {

src/app/pages/pages.component.ts

@@ -4,7 +4,7 @@ import {ChangeDetectionStrategy, Component} from '@angular/core';
   selector: 'app-pages',
   templateUrl: './pages.component.html',
   styleUrls: ['./pages.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class PagesComponent {
   url: string = 'https://dashboard.sarafu.network/';

src/app/pages/pages.module.ts

@@ -10,7 +10,6 @@ import {MatSelectModule} from '@angular/material/select';
 import { MatInputModule } from '@angular/material/input';
 import { MatCardModule } from '@angular/material/card';
 
-
 @NgModule({
   declarations: [PagesComponent],
   imports: [
@@ -21,7 +20,7 @@ import {MatCardModule} from '@angular/material/card';
     MatFormFieldModule,
     MatSelectModule,
     MatInputModule,
-        MatCardModule
+    MatCardModule,
-    ]
+  ],
 })
 export class PagesModule {}

src/app/pages/settings/organization/organization.component.spec.ts

@@ -15,14 +15,10 @@ describe('OrganizationComponent', () => {
         OrganizationComponent,
         FooterStubComponent,
         SidebarStubComponent,
-        TopbarStubComponent
+        TopbarStubComponent,
       ],
-      imports: [
+      imports: [AppModule, SettingsModule],
-        AppModule,
+    }).compileComponents();
-        SettingsModule,
-      ]
-    })
-    .compileComponents();
   });
 
   beforeEach(() => {

src/app/pages/settings/organization/organization.component.ts

@@ -6,30 +6,32 @@ import {CustomErrorStateMatcher} from '@app/_helpers';
   selector: 'app-organization',
   templateUrl: './organization.component.html',
   styleUrls: ['./organization.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class OrganizationComponent implements OnInit {
   organizationForm: FormGroup;
   submitted: boolean = false;
   matcher: CustomErrorStateMatcher = new CustomErrorStateMatcher();
 
-  constructor(
+  constructor(private formBuilder: FormBuilder) {}
-    private formBuilder: FormBuilder
-  ) { }
 
   ngOnInit(): void {
     this.organizationForm = this.formBuilder.group({
       disbursement: ['', Validators.required],
       transfer: '',
-      countryCode: ['', Validators.required]
+      countryCode: ['', Validators.required],
     });
   }
 
-  get organizationFormStub(): any { return this.organizationForm.controls; }
+  get organizationFormStub(): any {
+    return this.organizationForm.controls;
+  }
 
   onSubmit(): void {
     this.submitted = true;
-    if (this.organizationForm.invalid || !confirm('Set organization information?')) { return; }
+    if (this.organizationForm.invalid || !confirm('Set organization information?')) {
+      return;
+    }
     this.submitted = false;
   }
 }

src/app/pages/settings/settings-routing.module.ts

@@ -7,11 +7,11 @@ import {OrganizationComponent} from '@pages/settings/organization/organization.c
 const routes: Routes = [
   { path: '', component: SettingsComponent },
   { path: 'organization', component: OrganizationComponent },
-  { path: '**', redirectTo: '', pathMatch: 'full' }
+  { path: '**', redirectTo: '', pathMatch: 'full' },
 ];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
+  exports: [RouterModule],
 })
 export class SettingsRoutingModule {}

src/app/pages/settings/settings.component.spec.ts

@@ -15,14 +15,10 @@ describe('SettingsComponent', () => {
         SettingsComponent,
         FooterStubComponent,
         SidebarStubComponent,
-        TopbarStubComponent
+        TopbarStubComponent,
       ],
-      imports: [
+      imports: [AppModule, SettingsModule],
-        AppModule,
+    }).compileComponents();
-        SettingsModule,
-      ]
-    })
-    .compileComponents();
   });
 
   beforeEach(() => {

src/app/pages/settings/settings.component.ts

@@ -10,7 +10,7 @@ import {exportCsv} from '@app/_helpers';
   selector: 'app-settings',
   templateUrl: './settings.component.html',
   styleUrls: ['./settings.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class SettingsComponent implements OnInit {
   date: string;
@@ -21,9 +21,7 @@ export class SettingsComponent implements OnInit {
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
-  constructor(
+  constructor(private authService: AuthService) {}
-    private authService: AuthService
-  ) { }
 
   ngOnInit(): void {
     const d = new Date();

src/app/pages/settings/settings.module.ts

@@ -19,7 +19,6 @@ import {MatSelectModule} from '@angular/material/select';
 import { MatMenuModule } from '@angular/material/menu';
 import { ReactiveFormsModule } from '@angular/forms';
 
-
 @NgModule({
   declarations: [SettingsComponent, OrganizationComponent],
   imports: [
@@ -38,7 +37,7 @@ import {ReactiveFormsModule} from '@angular/forms';
     MatCheckboxModule,
     MatSelectModule,
     MatMenuModule,
-    ReactiveFormsModule
+    ReactiveFormsModule,
-  ]
+  ],
 })
 export class SettingsModule {}

src/app/pages/tokens/token-details/token-details.component.spec.ts

@@ -1,7 +1,13 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TokenDetailsComponent } from '@pages/tokens/token-details/token-details.component';
-import {ActivatedRouteStub, FooterStubComponent, SidebarStubComponent, TokenServiceStub, TopbarStubComponent} from '@src/testing';
+import {
+  ActivatedRouteStub,
+  FooterStubComponent,
+  SidebarStubComponent,
+  TokenServiceStub,
+  TopbarStubComponent,
+} from '@src/testing';
 import { ActivatedRoute } from '@angular/router';
 import { TokenService } from '@app/_services';
 import { TokensModule } from '@pages/tokens/tokens.module';
@@ -20,18 +26,14 @@ describe('TokenDetailsComponent', () => {
         TokenDetailsComponent,
         FooterStubComponent,
         SidebarStubComponent,
-        TopbarStubComponent
+        TopbarStubComponent,
       ],
       providers: [
         { provide: ActivatedRoute, useValue: route },
-        { provide: TokenService, useClass: TokenServiceStub }
+        { provide: TokenService, useClass: TokenServiceStub },
       ],
-      imports: [
+      imports: [AppModule, TokensModule],
-        AppModule,
+    }).compileComponents();
-        TokensModule,
-      ]
-    })
-    .compileComponents();
   });
 
   beforeEach(() => {

src/app/pages/tokens/token-details/token-details.component.ts

@@ -8,23 +8,21 @@ import {Token} from '../../../_models';
   selector: 'app-token-details',
   templateUrl: './token-details.component.html',
   styleUrls: ['./token-details.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class TokenDetailsComponent implements OnInit {
   token: Token;
 
-  constructor(
+  constructor(private route: ActivatedRoute, private tokenService: TokenService) {
-    private route: ActivatedRoute,
-    private tokenService: TokenService
-  ) {
     this.route.paramMap.subscribe((params: Params) => {
-      this.tokenService.getTokenBySymbol(params.get('id')).pipe(first()).subscribe(res => {
+      this.tokenService
+        .getTokenBySymbol(params.get('id'))
+        .pipe(first())
+        .subscribe((res) => {
           this.token = res;
         });
     });
   }
 
-  ngOnInit(): void {
+  ngOnInit(): void {}
-  }
-
 }

src/app/pages/tokens/tokens-routing.module.ts

@@ -11,6 +11,6 @@ const routes: Routes = [
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
+  exports: [RouterModule],
 })
 export class TokensRoutingModule {}

src/app/pages/tokens/tokens.component.spec.ts

@@ -15,14 +15,10 @@ describe('TokensComponent', () => {
         TokensComponent,
         FooterStubComponent,
         SidebarStubComponent,
-        TopbarStubComponent
+        TopbarStubComponent,
       ],
-      imports: [
+      imports: [AppModule, TokensModule],
-        AppModule,
+    }).compileComponents();
-        TokensModule
-      ]
-    })
-    .compileComponents();
   });
 
   beforeEach(() => {

src/app/pages/tokens/tokens.component.ts

@@ -12,7 +12,7 @@ import {Token} from '../../_models';
   selector: 'app-tokens',
   templateUrl: './tokens.component.html',
   styleUrls: ['./tokens.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class TokensComponent implements OnInit {
   dataSource: MatTableDataSource<any>;

src/app/pages/tokens/tokens.module.ts

@@ -18,7 +18,6 @@ import {MatButtonModule} from '@angular/material/button';
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatCardModule } from '@angular/material/card';
 
-
 @NgModule({
   declarations: [TokensComponent, TokenDetailsComponent],
   imports: [
@@ -37,7 +36,7 @@ import {MatCardModule} from '@angular/material/card';
     MatButtonModule,
     MatToolbarModule,
     MatCardModule,
-        MatRippleModule
+    MatRippleModule,
-    ]
+  ],
 })
 export class TokensModule {}

src/app/pages/transactions/transaction-details/transaction-details.component.spec.ts

@@ -8,9 +8,8 @@ describe('TransactionDetailsComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ TransactionDetailsComponent ]
+      declarations: [TransactionDetailsComponent],
-    })
+    }).compileComponents();
-    .compileComponents();
   });
 
   beforeEach(() => {

src/app/pages/transactions/transaction-details/transaction-details.component.ts

@@ -9,7 +9,7 @@ import {strip0x} from '@src/assets/js/ethtx/dist/hex';
   selector: 'app-transaction-details',
   templateUrl: './transaction-details.component.html',
   styleUrls: ['./transaction-details.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class TransactionDetailsComponent implements OnInit {
   @Input() transaction;
@@ -20,15 +20,18 @@ export class TransactionDetailsComponent implements OnInit {
   constructor(
     private router: Router,
     private transactionService: TransactionService,
-    private snackBar: MatSnackBar,
+    private snackBar: MatSnackBar
   ) {}
 
   ngOnInit(): void {
     if (this.transaction?.type === 'conversion') {
-      this.traderBloxbergLink = 'https://blockexplorer.bloxberg.org/address/' + this.transaction?.trader + '/transactions';
+      this.traderBloxbergLink =
+        'https://blockexplorer.bloxberg.org/address/' + this.transaction?.trader + '/transactions';
     } else {
-      this.senderBloxbergLink = 'https://blockexplorer.bloxberg.org/address/' + this.transaction?.from + '/transactions';
+      this.senderBloxbergLink =
-      this.recipientBloxbergLink = 'https://blockexplorer.bloxberg.org/address/' + this.transaction?.to + '/transactions';
+        'https://blockexplorer.bloxberg.org/address/' + this.transaction?.from + '/transactions';
+      this.recipientBloxbergLink =
+        'https://blockexplorer.bloxberg.org/address/' + this.transaction?.to + '/transactions';
     }
   }
 

src/app/pages/transactions/transactions-routing.module.ts

@@ -7,6 +7,6 @@ const routes: Routes = [{ path: '', component: TransactionsComponent }];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
+  exports: [RouterModule],
 })
 export class TransactionsRoutingModule {}

src/app/pages/transactions/transactions.component.spec.ts

@@ -19,15 +19,10 @@ describe('TransactionsComponent', () => {
         TransactionsComponent,
         FooterStubComponent,
         SidebarStubComponent,
-        TopbarStubComponent
+        TopbarStubComponent,
       ],
-      imports: [
+      imports: [AppModule, HttpClientTestingModule, TransactionsModule],
-        AppModule,
+    }).compileComponents();
-        HttpClientTestingModule,
-        TransactionsModule
-      ]
-    })
-    .compileComponents();
     httpClient = TestBed.inject(HttpClient);
     httpTestingController = TestBed.inject(HttpTestingController);
   });

src/app/pages/transactions/transactions.component.ts

@@ -1,4 +1,10 @@
-import {AfterViewInit, ChangeDetectionStrategy, Component, OnInit, ViewChild} from '@angular/core';
+import {
+  AfterViewInit,
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
 import { BlockSyncService, TransactionService, UserService } from '@app/_services';
 import { MatTableDataSource } from '@angular/material/table';
 import { MatPaginator } from '@angular/material/paginator';
@@ -11,7 +17,7 @@ import {Transaction} from '@app/_models';
   selector: 'app-transactions',
   templateUrl: './transactions.component.html',
   styleUrls: ['./transactions.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class TransactionsComponent implements OnInit, AfterViewInit {
   transactionDataSource: MatTableDataSource<any>;
@@ -35,13 +41,16 @@ export class TransactionsComponent implements OnInit, AfterViewInit {
   }
 
   ngOnInit(): void {
-    this.transactionService.transactionsSubject.subscribe(transactions => {
+    this.transactionService.transactionsSubject.subscribe((transactions) => {
       this.transactionDataSource = new MatTableDataSource<any>(transactions);
       this.transactionDataSource.paginator = this.paginator;
       this.transactionDataSource.sort = this.sort;
       this.transactions = transactions;
     });
-    this.userService.getTransactionTypes().pipe(first()).subscribe(res => this.transactionsTypes = res);
+    this.userService
+      .getTransactionTypes()
+      .pipe(first())
+      .subscribe((res) => (this.transactionsTypes = res));
   }
 
   viewTransaction(transaction): void {
@@ -54,12 +63,14 @@ export class TransactionsComponent implements OnInit, AfterViewInit {
 
   filterTransactions(): void {
     if (this.transactionsType === 'all') {
-      this.transactionService.transactionsSubject.subscribe(transactions => {
+      this.transactionService.transactionsSubject.subscribe((transactions) => {
         this.transactionDataSource.data = transactions;
         this.transactions = transactions;
       });
     } else {
-      this.transactionDataSource.data = this.transactions.filter(transaction => transaction.type === this.transactionsType);
+      this.transactionDataSource.data = this.transactions.filter(
+        (transaction) => transaction.type === this.transactionsType
+      );
     }
   }
 

src/app/pages/transactions/transactions.module.ts

@@ -18,12 +18,9 @@ import {MatCardModule} from '@angular/material/card';
 import { MatRippleModule } from '@angular/material/core';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 
-
 @NgModule({
   declarations: [TransactionsComponent, TransactionDetailsComponent],
-  exports: [
+  exports: [TransactionDetailsComponent],
-    TransactionDetailsComponent
-  ],
   imports: [
     CommonModule,
     TransactionsRoutingModule,
@@ -40,6 +37,6 @@ import {MatSnackBarModule} from '@angular/material/snack-bar';
     MatCardModule,
     MatRippleModule,
     MatSnackBarModule,
-    ]
+  ],
 })
 export class TransactionsModule {}

src/app/shared/_directives/menu-selection.directive.spec.ts

@@ -2,7 +2,9 @@ import { MenuSelectionDirective } from '@app/shared/_directives/menu-selection.d
 import { ElementRef, Renderer2 } from '@angular/core';
 
 describe('MenuSelectionDirective', () => {
+  // tslint:disable-next-line:prefer-const
   let elementRef: ElementRef;
+  // tslint:disable-next-line:prefer-const
   let renderer: Renderer2;
 
   beforeEach(() => {

src/app/shared/_directives/menu-selection.directive.ts

@@ -1,14 +1,10 @@
 import { Directive, ElementRef, Renderer2 } from '@angular/core';
 
 @Directive({
-  selector: '[appMenuSelection]'
+  selector: '[appMenuSelection]',
 })
 export class MenuSelectionDirective {
-
+  constructor(private elementRef: ElementRef, private renderer: Renderer2) {
-  constructor(
-    private elementRef: ElementRef,
-    private renderer: Renderer2
-  ) {
     this.renderer.listen(this.elementRef.nativeElement, 'click', () => {
       const mediaQuery = window.matchMedia('(max-width: 768px)');
       if (mediaQuery.matches) {

src/app/shared/_directives/menu-toggle.directive.spec.ts

@@ -2,7 +2,9 @@ import { MenuToggleDirective } from '@app/shared/_directives/menu-toggle.directi
 import { ElementRef, Renderer2 } from '@angular/core';
 
 describe('MenuToggleDirective', () => {
+  // tslint:disable-next-line:prefer-const
   let elementRef: ElementRef;
+  // tslint:disable-next-line:prefer-const
   let renderer: Renderer2;
   it('should create an instance', () => {
     const directive = new MenuToggleDirective(elementRef, renderer);

src/app/shared/_directives/menu-toggle.directive.ts

@@ -1,14 +1,10 @@
 import { Directive, ElementRef, Renderer2 } from '@angular/core';
 
 @Directive({
-  selector: '[appMenuToggle]'
+  selector: '[appMenuToggle]',
 })
 export class MenuToggleDirective {
-
+  constructor(private elementRef: ElementRef, private renderer: Renderer2) {
-  constructor(
-    private elementRef: ElementRef,
-    private renderer: Renderer2
-  ) {
     this.renderer.listen(this.elementRef.nativeElement, 'click', () => {
       this.onMenuToggle();
     });

src/app/shared/_pipes/safe.pipe.ts

@@ -2,14 +2,12 @@ import { Pipe, PipeTransform } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
 
 @Pipe({
-  name: 'safe'
+  name: 'safe',
 })
 export class SafePipe implements PipeTransform {
-
   constructor(private sanitizer: DomSanitizer) {}
 
   transform(url: string, ...args: unknown[]): unknown {
     return this.sanitizer.bypassSecurityTrustResourceUrl(url);
   }
-
 }

src/app/shared/error-dialog/error-dialog.component.spec.ts

@@ -8,9 +8,8 @@ describe('ErrorDialogComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ ErrorDialogComponent ]
+      declarations: [ErrorDialogComponent],
-    })
+    }).compileComponents();
-    .compileComponents();
   });
 
   beforeEach(() => {

src/app/shared/error-dialog/error-dialog.component.ts

@@ -5,10 +5,8 @@ import {MAT_DIALOG_DATA} from '@angular/material/dialog';
   selector: 'app-error-dialog',
   templateUrl: './error-dialog.component.html',
   styleUrls: ['./error-dialog.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ErrorDialogComponent {
-
   constructor(@Inject(MAT_DIALOG_DATA) public data: any) {}
-
 }

src/app/shared/footer/footer.component.spec.ts

@@ -8,9 +8,8 @@ describe('FooterComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ FooterComponent ]
+      declarations: [FooterComponent],
-    })
+    }).compileComponents();
-    .compileComponents();
   });
 
   beforeEach(() => {