fix: fix merge issues for setup-wizard project

web/projects/ui/src/app/services/api/embassy-api.service.ts

@@ -1,13 +1,12 @@
-import { Observable } from 'rxjs'
-import { RR, BackupTargetType, Metrics } from './api.types'
-import { SetupStatus } from '@start9labs/shared'
-import { RPCOptions } from '@start9labs/shared'
-import { T } from '@start9labs/start-sdk'
 import {
   GetPackageRes,
   GetPackagesRes,
   MarketplacePkg,
 } from '@start9labs/marketplace'
+import { RPCOptions } from '@start9labs/shared'
+import { T } from '@start9labs/start-sdk'
+import { Observable } from 'rxjs'
+import { BackupTargetType, RR } from './api.types'
 
 export abstract class ApiService {
   // http

web/projects/ui/src/app/services/api/embassy-mock-api.service.ts

@@ -2,7 +2,6 @@ import { Injectable } from '@angular/core'
 import {
   pauseFor,
   Log,
-  getSetupStatusMock,
   RPCErrorDetails,
   RPCOptions,
 } from '@start9labs/shared'

web/projects/ui/src/polyfills.ts

@@ -1,60 +1,5 @@
-/**
- * This file includes polyfills needed by Angular and is loaded before the app.
- * You can add your own extra polyfills to this file.
- *
- * This file is divided into 2 sections:
- *   1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
- *   2. Application imports. Files imported after ZoneJS that should be loaded before your main
- *      file.
- *
- * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
- * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
- * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
- *
- * Learn more in https://angular.io/guide/browser-support
- */
+import { Buffer } from 'buffer'
 
-/***************************************************************************************************
- * BROWSER POLYFILLS
- */
-
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
-// import 'classlist.js';  // Run `npm install --save classlist.js`.
-
-/**
- * Web Animations `@angular/platform-browser/animations`
- * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
- * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
- */
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
-/**
- * By default, zone.js will patch all possible macroTask and DomEvents
- * user can disable parts of macroTask/DomEvents patch by setting following flags
- * because those flags need to be set before `zone.js` being loaded, and webpack
- * will put import in the top of bundle, so user need to create a separate file
- * in this directory (for example: zone-flags.ts), and put the following flags
- * into that file, and then add the following code before importing zone.js.
- * import './zone-flags.ts';
- *
- * The flags allowed in zone-flags.ts are listed here.
- *
- * The following flags will work for all browsers.
- *
- * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
- * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
- * (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
- *
- *  in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
- *  with the following flag, it will bypass `zone.js` patch for IE/Edge
- *
- *  (window as any).__Zone_enable_cross_context_check = true;
- *
- */
-
-// @TODO Alex include in angular.json
 ;(window as any).global = window
 ;(window as any).process = { env: { DEBUG: undefined }, browser: true }
-
-import { Buffer } from 'buffer'
 ;(window as any).Buffer = Buffer