From 5656fd0b96c8b22a6bb7705ea959b4321a090b41 Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Tue, 10 Jan 2023 14:53:57 -0700
Subject: [PATCH] fix config bug for number 0 and also maybe conenction icon
 (#2098)

* fix config bug for number 0 and also maybe conenction icon

* add max password length to confimation input
---
 .../setup-wizard/src/app/modals/password/password.page.html   | 3 ++-
 .../components/connection-bar/connection-bar.component.html   | 1 -
 frontend/projects/ui/src/app/services/api/api.fixures.ts      | 2 +-
 frontend/projects/ui/src/app/services/form.service.ts         | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/projects/setup-wizard/src/app/modals/password/password.page.html b/frontend/projects/setup-wizard/src/app/modals/password/password.page.html
index a603fdf32..003b1132c 100644
--- a/frontend/projects/setup-wizard/src/app/modals/password/password.page.html
+++ b/frontend/projects/setup-wizard/src/app/modals/password/password.page.html
@@ -48,8 +48,9 @@
             [(ngModel)]="passwordVer"
             [ngModelOptions]="{'standalone': true}"
             [type]="!unmasked2 ? 'password' : 'text'"
-            (ionChange)="checkVer()"
             placeholder="Retype Password"
+            (ionChange)="checkVer()"
+            maxlength="64"
           ></ion-input>
           <ion-button
             fill="clear"
diff --git a/frontend/projects/ui/src/app/components/connection-bar/connection-bar.component.html b/frontend/projects/ui/src/app/components/connection-bar/connection-bar.component.html
index 007d47ab5..d6aba1358 100644
--- a/frontend/projects/ui/src/app/components/connection-bar/connection-bar.component.html
+++ b/frontend/projects/ui/src/app/components/connection-bar/connection-bar.component.html
@@ -5,7 +5,6 @@
 >
   <div class="inline" slot="start">
     <ion-icon
-      slot="end"
       [name]="connection.icon"
       class="icon"
       [color]="connection.iconColor"
diff --git a/frontend/projects/ui/src/app/services/api/api.fixures.ts b/frontend/projects/ui/src/app/services/api/api.fixures.ts
index 7f8e1add0..7ae04400a 100644
--- a/frontend/projects/ui/src/app/services/api/api.fixures.ts
+++ b/frontend/projects/ui/src/app/services/api/api.fixures.ts
@@ -1725,7 +1725,7 @@ export module Mock {
     ],
     'union-list': undefined,
     'random-enum': 'option2',
-    'favorite-number': null,
+    'favorite-number': 0,
     rpcsettings: {
       laws: {
         law1: 'The first law Amended',
diff --git a/frontend/projects/ui/src/app/services/form.service.ts b/frontend/projects/ui/src/app/services/form.service.ts
index 97cc5589c..dd861a348 100644
--- a/frontend/projects/ui/src/app/services/form.service.ts
+++ b/frontend/projects/ui/src/app/services/form.service.ts
@@ -523,7 +523,9 @@ export function convertValuesRecursive(
     if (!control) return
 
     if (valueSpec.type === 'number') {
-      control.setValue(control.value ? Number(control.value) : null)
+      control.setValue(
+        control.value || control.value === 0 ? Number(control.value) : null,
+      )
     } else if (valueSpec.type === 'string') {
       if (!control.value) control.setValue(null)
     } else if (valueSpec.type === 'object') {