From 42475becf14135bba9d6205cc1857646f9a0e35f Mon Sep 17 00:00:00 2001
From: Kevin Cooper <kevin@cooper.uk.com>
Date: Mon, 17 Jun 2019 23:08:14 +0100
Subject: [PATCH] Fix for more-info-alarm_control_panel when using
 code_arm_required (#3052)

* Fix for more-infoalarm_control_panel when using code_arm_required

* Update more-info-alarm_control_panel.js
---
 .../more-info/controls/more-info-alarm_control_panel.js   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/dialogs/more-info/controls/more-info-alarm_control_panel.js b/src/dialogs/more-info/controls/more-info-alarm_control_panel.js
index 6f985d36d2..1301b2808e 100644
--- a/src/dialogs/more-info/controls/more-info-alarm_control_panel.js
+++ b/src/dialogs/more-info/controls/more-info-alarm_control_panel.js
@@ -187,7 +187,8 @@ class MoreInfoAlarmControlPanel extends LocalizeMixin(
       },
       _codeValid: {
         type: Boolean,
-        computed: "_validateCode(_enteredCode, _codeFormat)",
+        computed:
+          "_validateCode(_enteredCode,  _codeFormat,  _armVisible, _codeArmRequired)",
       },
       _disarmVisible: {
         type: Boolean,
@@ -220,6 +221,7 @@ class MoreInfoAlarmControlPanel extends LocalizeMixin(
       const props = {
         _codeFormat: newVal.attributes.code_format,
         _armVisible: state === "disarmed",
+        _codeArmRequired: newVal.attributes.code_arm_required,
         _disarmVisible:
           this._armedStates.includes(state) ||
           state === "pending" ||
@@ -240,8 +242,8 @@ class MoreInfoAlarmControlPanel extends LocalizeMixin(
     return format === "Number";
   }
 
-  _validateCode(code, format) {
-    return !format || code.length > 0;
+  _validateCode(code, format, armVisible, codeArmRequired) {
+    return !format || code.length > 0 || (armVisible && !codeArmRequired);
   }
 
   _digitClicked(ev) {