From 044c4cc7b2ccb56135e537fde2b6e229ae2bd426 Mon Sep 17 00:00:00 2001
From: Matt Hill <matthewonthemoon@gmail.com>
Date: Wed, 1 Dec 2021 20:42:10 -0700
Subject: [PATCH] fix pointer issue with mocks, better styles

---
 ui/src/app/components/logs/logs.page.scss     |  3 ++
 .../app-list-icon.component.scss              |  4 --
 .../app-list-pkg/app-list-pkg.component.html  |  2 +-
 .../app-list-reorder.component.html           |  4 +-
 .../app/pages/server-routes/wifi/wifi.page.ts |  2 -
 ui/src/app/services/api/api.fixures.ts        | 48 -------------------
 .../services/api/embassy-mock-api.service.ts  |  5 +-
 7 files changed, 7 insertions(+), 61 deletions(-)

diff --git a/ui/src/app/components/logs/logs.page.scss b/ui/src/app/components/logs/logs.page.scss
index e69de29bb..dcd863c00 100644
--- a/ui/src/app/components/logs/logs.page.scss
+++ b/ui/src/app/components/logs/logs.page.scss
@@ -0,0 +1,3 @@
+#container {
+  padding-bottom: 16px;
+}
\ No newline at end of file
diff --git a/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.scss b/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.scss
index c4b5c04ad..751ca35a1 100644
--- a/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.scss
+++ b/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.scss
@@ -1,7 +1,3 @@
-:host {
-  display: block;
-}
-
 .bulb {
   position: absolute !important;
   left: 9px !important;
diff --git a/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html b/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
index 7926dbe36..61565e1fe 100644
--- a/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
+++ b/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
@@ -4,7 +4,7 @@
     [pkg]="pkg"
     [connectionFailure]="connectionFailure"
   ></app-list-icon>
-  <ion-thumbnail slot="start" class="ion-margin-start">
+  <ion-thumbnail slot="start">
     <img alt="" [src]="pkg.entry['static-files'].icon" />
   </ion-thumbnail>
   <ion-label>
diff --git a/ui/src/app/pages/apps-routes/app-list/app-list-reorder/app-list-reorder.component.html b/ui/src/app/pages/apps-routes/app-list/app-list-reorder/app-list-reorder.component.html
index c85849b82..f46253aaa 100644
--- a/ui/src/app/pages/apps-routes/app-list/app-list-reorder/app-list-reorder.component.html
+++ b/ui/src/app/pages/apps-routes/app-list/app-list-reorder/app-list-reorder.component.html
@@ -1,7 +1,7 @@
 <!-- header -->
 <ion-item-divider>
   {{ reordering ? "Reorder" : "Installed Services" }}
-  <ion-button slot="end" fill="clear" (click)="toggle()">
+  <ion-button *ngIf="pkgs.length > 1" slot="end" fill="clear" (click)="toggle()">
     <ion-icon
       slot="start"
       [name]="reordering ? 'checkmark' : 'swap-vertical'"
@@ -20,7 +20,7 @@
           [pkg]="pkg"
           [connectionFailure]="connectionFailure$ | async"
         ></app-list-icon>
-        <ion-thumbnail slot="start" class="ion-margin-start">
+        <ion-thumbnail slot="start">
           <img alt="" [src]="pkg.entry['static-files'].icon" />
         </ion-thumbnail>
         <ion-label>
diff --git a/ui/src/app/pages/server-routes/wifi/wifi.page.ts b/ui/src/app/pages/server-routes/wifi/wifi.page.ts
index b06445fef..5aa6fe917 100644
--- a/ui/src/app/pages/server-routes/wifi/wifi.page.ts
+++ b/ui/src/app/pages/server-routes/wifi/wifi.page.ts
@@ -253,8 +253,6 @@ export class WifiPage {
     try {
       await this.api.deleteWifi({ ssid })
       this.wifi.ssids = this.wifi.ssids.filter((w, index) => index !== i)
-
-      console.log(this.wifi.ssids)
     } catch (e) {
       this.errToast.present(e)
     } finally {
diff --git a/ui/src/app/services/api/api.fixures.ts b/ui/src/app/services/api/api.fixures.ts
index f35576f0a..4972ad1be 100644
--- a/ui/src/app/services/api/api.fixures.ts
+++ b/ui/src/app/services/api/api.fixures.ts
@@ -1801,41 +1801,6 @@ export module Mock {
 
   export const MockConfig = realWorldConfigSpec.config
 
-  const testConfig = {
-    testnet: false,
-    'object-list': [
-      {
-        'first-name': 'First',
-        'last-name': 'Last',
-        'age': 30,
-      },
-      {
-        'first-name': 'First2',
-        'last-name': 'Last2',
-        'age': 40,
-      },
-    ],
-    'union-list': undefined,
-    'random-enum': 'option1',
-    'favorite-number': null,
-    rpcsettings: {
-      laws: {
-        law1: 'The first law',
-        law2: 'The second law',
-      },
-      rpcpass: null,
-      rpcuser: '123',
-      rulemakers: [],
-    },
-    advanced: {
-      notifications: ['email', 'text'],
-    },
-    'bitcoin-node': undefined,
-    port: 5959,
-    rpcallowip: undefined,
-    rpcauth: ['matt: 8273gr8qwoidm1uid91jeh8y23gdio1kskmwejkdnm'],
-  }
-
   export const MockDependencyConfig = {
     testnet: true,
     'object-list': [
@@ -1876,19 +1841,6 @@ export module Mock {
     rpcauth: ['matt: 8273gr8qwoidm1uid91jeh8y23gdio1kskmwejkdnm'],
   }
 
-  export const Patch: Operation[] = [
-    {
-      op: 'replace',
-      path: '/testnet',
-      value: true,
-    },
-    {
-      op: 'add',
-      path: '/advanced/notifications/1',
-      value: 'text',
-    },
-  ]
-
   export const bitcoind: PackageDataEntry = {
     state: PackageState.Installed,
     'static-files': {
diff --git a/ui/src/app/services/api/embassy-mock-api.service.ts b/ui/src/app/services/api/embassy-mock-api.service.ts
index b5f8f068f..4670f8431 100644
--- a/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -663,7 +663,7 @@ export class MockApiService extends ApiService {
         {
           op: PatchOp.REPLACE,
           path: `/package-data/${id}`,
-          value: Mock.LocalPkgs[id],
+          value: { ...Mock.LocalPkgs[id] },
         },
         {
           op: PatchOp.REMOVE,
@@ -734,7 +734,6 @@ export class MockApiService extends ApiService {
       patch,
       expireId: null,
     }
-    console.log('REVISION', revision)
     this.mockPatch$.next(revision)
   }
 
@@ -750,8 +749,6 @@ export class MockApiService extends ApiService {
       expireId: null,
     }
 
-    console.log('REVISION', revision)
-
     return { response, revision }
   }
 }