From 6fe0bffe51825694e226bc23e6665b8ba8eeb9d0 Mon Sep 17 00:00:00 2001
From: Harrison Carter <harrison.carter@smartthings.com>
Date: Mon, 4 May 2026 10:44:31 -0500
Subject: [PATCH 1/2] Re-profile in the embedded config profile case

---
 .../matter-lock/src/new-matter-lock/init.lua  |  3 +-
 .../src/test/test_matter_lock_modular.lua     | 73 +++++++++++++++++++
 2 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/drivers/SmartThings/matter-lock/src/new-matter-lock/init.lua b/drivers/SmartThings/matter-lock/src/new-matter-lock/init.lua
index fbea3ebfb5..adcbc04283 100644
--- a/drivers/SmartThings/matter-lock/src/new-matter-lock/init.lua
+++ b/drivers/SmartThings/matter-lock/src/new-matter-lock/init.lua
@@ -259,7 +259,8 @@ local function match_profile_modular(driver, device)
   end
 
   table.insert(enabled_optional_component_capability_pairs, {"main", main_component_capabilities})
-  if lock_utils.optional_capabilities_list_changed(enabled_optional_component_capability_pairs, device.profile.components) then
+  if modular_profile_name == "lock-modular-embedded-unlatch" -- the embedded config that may be needed is not checked by an optional capability comparison
+    or lock_utils.optional_capabilities_list_changed(enabled_optional_component_capability_pairs, device.profile.components) then
     device:try_update_metadata({profile = modular_profile_name, optional_component_capabilities = enabled_optional_component_capability_pairs})
   end
 end
diff --git a/drivers/SmartThings/matter-lock/src/test/test_matter_lock_modular.lua b/drivers/SmartThings/matter-lock/src/test/test_matter_lock_modular.lua
index cb22abdf7d..dfd9d0b573 100644
--- a/drivers/SmartThings/matter-lock/src/test/test_matter_lock_modular.lua
+++ b/drivers/SmartThings/matter-lock/src/test/test_matter_lock_modular.lua
@@ -623,4 +623,77 @@ test.register_coroutine_test(
   }
 )
 
+
+local mock_nuki_smart_lock_ultra = test.mock_device.build_test_matter_device({
+  profile = t_utils.get_profile_definition("lock-nocodes-notamper.yml"),
+  manufacturer_info = {
+    vendor_id = 0x115f,
+    product_id = 0x2802,
+  },
+  endpoints = {
+    {
+      endpoint_id = 0,
+      clusters = {
+        { cluster_id = clusters.BasicInformation.ID, cluster_type = "SERVER" },
+      },
+      device_types = {
+        { device_type_id = 0x0016, device_type_revision = 1 } -- RootNode
+      }
+    },
+    {
+      endpoint_id = 1,
+      clusters = {
+        {
+          cluster_id = DoorLock.ID,
+          cluster_type = "SERVER",
+          cluster_revision = 1,
+          feature_map = 0x1000, -- UNBOLT
+        },
+        {
+          cluster_id = clusters.PowerSource.ID,
+          cluster_type = "SERVER",
+          feature_map = 10
+        },
+      },
+      device_types = {
+        { device_type_id = 0x000A, device_type_revision = 1 } -- Door Lock
+      }
+    }
+  }
+})
+
+local battery_support = {
+  NO_BATTERY = "NO_BATTERY",
+  BATTERY_LEVEL = "BATTERY_LEVEL",
+  BATTERY_PERCENTAGE = "BATTERY_PERCENTAGE"
+}
+
+local profiling_data = {
+  BATTERY_SUPPORT = "__BATTERY_SUPPORT",
+}
+
+test.register_coroutine_test(
+  "Test Nuki Smart Lock Ultra profile change with user and pin supported",
+  function()
+    -- technically, since power source attributes must be read, this wouldn't be running via doConfigure, but this is straightforward.
+    test.socket.device_lifecycle:__queue_receive({ mock_nuki_smart_lock_ultra.id, "doConfigure" })
+    test.socket.capability:__expect_send(
+      mock_nuki_smart_lock_ultra:generate_test_message("main", capabilities.lock.supportedLockValues({"locked", "unlocked", "unlatched", "not fully locked"}, {visibility = {displayed = false}}))
+    )
+    test.socket.capability:__expect_send(
+      mock_nuki_smart_lock_ultra:generate_test_message("main", capabilities.lock.supportedLockCommands({"lock", "unlock", "unlatch"}, {visibility = {displayed = false}}))
+    )
+    mock_nuki_smart_lock_ultra:expect_metadata_update({ profile = "lock-modular-embedded-unlatch", optional_component_capabilities = {{"main", {"battery"}}}})
+    mock_nuki_smart_lock_ultra:expect_metadata_update({ provisioning_state = "PROVISIONED" })
+  end,
+  {
+    test_init = function()
+      test.disable_startup_messages()
+      test.mock_device.add_test_device(mock_nuki_smart_lock_ultra)
+      mock_nuki_smart_lock_ultra:set_field(profiling_data.BATTERY_SUPPORT, battery_support.BATTERY_PERCENTAGE, {persist = true}) -- assume this has been set previously
+    end,
+    min_api_version = 17
+  }
+)
+
 test.run_registered_tests()

From 2c5714c337f99230a3cc3e1916cde41e4458cd35 Mon Sep 17 00:00:00 2001
From: Harrison Carter <harrison.carter@smartthings.com>
Date: Mon, 4 May 2026 15:24:05 -0500
Subject: [PATCH 2/2] user actual nuki manufacurer info

---
 .../matter-lock/src/test/test_matter_lock_modular.lua         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/SmartThings/matter-lock/src/test/test_matter_lock_modular.lua b/drivers/SmartThings/matter-lock/src/test/test_matter_lock_modular.lua
index dfd9d0b573..4b875fd1bc 100644
--- a/drivers/SmartThings/matter-lock/src/test/test_matter_lock_modular.lua
+++ b/drivers/SmartThings/matter-lock/src/test/test_matter_lock_modular.lua
@@ -627,8 +627,8 @@ test.register_coroutine_test(
 local mock_nuki_smart_lock_ultra = test.mock_device.build_test_matter_device({
   profile = t_utils.get_profile_definition("lock-nocodes-notamper.yml"),
   manufacturer_info = {
-    vendor_id = 0x115f,
-    product_id = 0x2802,
+    vendor_id = 0x135D,
+    product_id = 0x00A1,
   },
   endpoints = {
     {