Display Bug: Multi-endpoint Matter devices in Home Automation

We’ve noticed an issue with multi-endpoint Matter devices where the firmware endpoints don’t correctly correlate to the displayed buttons in the Home Automation UI.

For example, when adding a 3-button Matter wall switch, the order of the buttons is incorrect. The actual button order on the device is 1/2/3, but in Home Automation it is displayed as 1/3/2.

It would be great if someone could look into optimizing or resolving this issue so the firmware endpoint mapping aligns properly with the displayed buttons for multi-endpoint Matter devices.

Looking forward to replying