From bd12f76b658e38cfc6985b239117a642bc38acb7 Mon Sep 17 00:00:00 2001
From: CalamityC <42971992+CalamityC@users.noreply.github.com>
Date: Thu, 16 Feb 2023 16:15:05 +0100
Subject: [PATCH] ERM-2637 (#317)

* make fields value null safe
* don't disable New button after deletion
---
 .../ProxyServerSettingsListFieldArray.js                      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/settings/components/ProxyServerSettingsConfig/ProxyServerSettingsListFieldArray/ProxyServerSettingsListFieldArray.js b/src/settings/components/ProxyServerSettingsConfig/ProxyServerSettingsListFieldArray/ProxyServerSettingsListFieldArray.js
index 25d5de4c..ca21d40f 100644
--- a/src/settings/components/ProxyServerSettingsConfig/ProxyServerSettingsListFieldArray/ProxyServerSettingsListFieldArray.js
+++ b/src/settings/components/ProxyServerSettingsConfig/ProxyServerSettingsListFieldArray/ProxyServerSettingsListFieldArray.js
@@ -34,8 +34,8 @@ export default class ProxyServerSettingsListFieldArray extends React.Component {
       onDelete(proxyServer);
     } else {
       fields.remove(index);
-      this.setState({ disableNewButton: false });
     }
+    this.setState({ disableNewButton: false });
   }
 
   handleNew = () => {
@@ -69,7 +69,7 @@ export default class ProxyServerSettingsListFieldArray extends React.Component {
           </Col>
         </Row>
         {
-          fields.value.map((proxyServer, i) => (
+          fields?.value?.map((proxyServer, i) => (
             <Field
               key={proxyServer.id || 'new'}
               component={ProxyServerSettingsFields}