Index: sources/gui/qml/pages/settings/SettingsWiFi.qml
===================================================================
diff -u -r5b46bc8e4724e4ddb648f901d76bb7ec24f8b6c7 -r6c6f1f5d466badd9b4fd67be7c907234c342b2a2
--- sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision 5b46bc8e4724e4ddb648f901d76bb7ec24f8b6c7)
+++ sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision 6c6f1f5d466badd9b4fd67be7c907234c342b2a2)
@@ -7,7 +7,7 @@
  *
  * \file    SettingsWiFi.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      23-May-2022
+ * \date    (last)      03-Apr-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  06-May-2021
  *
@@ -28,7 +28,8 @@
  * \brief   SettingsWiFi
  *          The settings screen to setup the WiFi connection
  */
-SettingsBase { id: _root
+SettingsBase    { id: _root
+    itemIndex       : SettingsStack.WiFi
 
     property var ipValidator: RegExpValidator {
         regExp:/^(([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))\.){3}([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))$/
@@ -53,7 +54,7 @@
     firstFocusInput : _ipAddress
     notificationText: vNetwork.status
     onConfirmClicked:  {
-        vDateTime.doConfirm(
+        vNetwork.doConfirm(
             _ipAddress  .textInput.text ,
             _gateway    .textInput.text ,
             _subnetmask .textInput.text ,
@@ -67,43 +68,40 @@
         anchors.leftMargin  : _root.leftMargin
 
         TextEntry { id      : _ipAddress
-            // nextInput       : _gateway // it's not needed to be entered in order all the time and also the keyboard needs to be hidden for the set result to be shown.
+            nextInput       : _gateway // helps user to tap on enter to go to the next entry, keyboard visibility is handled by TextEntry.
             textInput.text  : vNetwork.ipAddress
             label.text      : qsTr("IP Address")
             textInput.width : entryWidth
             label.width     : labelWidth
-            hasCarret       : true
+            hasCursor       : false // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
             onEnterPressed  : {
-                _keyboard.setVisible(false)
                 vNetwork.doSetIPAddress(textInput.text)
             }
         }
 
         TextEntry { id      : _gateway
-            // nextInput       : _subnetmask // it's not needed to be entered in order all the time and also the keyboard needs to be hidden for the set result to be shown.
+            nextInput       : _subnetmask // helps user to tap on enter to go to the next entry, keyboard visibility is handled by TextEntry.
             textInput.text  : vNetwork.gateway
             textInput.width : entryWidth
             label.width     : labelWidth
             label.text      : qsTr("Gateway")
-            hasCarret       : true
+            hasCursor       : false // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
             onEnterPressed  : {
-                _keyboard.setVisible(false)
                 vNetwork.doSetGateway(textInput.text)
             }
         }
 
         TextEntry { id      : _subnetmask
-            // nextInput       : _dns // it's not needed to be entered in order all the time and also the keyboard needs to be hidden for the set result to be shown.
+            nextInput       : _dns // helps user to tap on enter to go to the next entry, keyboard visibility is handled by TextEntry.
             textInput.text  : vNetwork.subnetMask
             textInput.width : entryWidth
             label.width     : labelWidth
             label.text      : qsTr("Subnet Mask")
-            hasCarret       : true
+            hasCursor       : false // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
             onEnterPressed  : {
-                _keyboard.setVisible(false)
                 vNetwork.doSetSubnetMask(textInput.text)
             }
         }
@@ -113,10 +111,9 @@
             textInput.width : entryWidth
             label.width     : labelWidth
             label.text      : qsTr("DNS")
-            hasCarret       : true
+            hasCursor       : false // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
             onEnterPressed  : {
-                _keyboard.setVisible(false)
                 vNetwork.doSetDNS(textInput.text)
             }
         }
@@ -233,8 +230,8 @@
         title               : isPassword ? qsTr("Join") + separator + ssid + spaceSeparator + qsTr("Password") : qsTr("Disconnect") + separator + ssid
         onConfirmClicked    : {
             if ( isPassword ) {
-                if( password.length > 0 ) {
-                    vNetwork.doJoinNetwork      ( macAddress, password )
+                if( passwordCurrent.length > 0 ) {
+                    vNetwork.doJoinNetwork  ( macAddress, passwordCurrent )
                     pop()
                 }
             } else {