From 76b4a393c0cb93a8575123a6a9d8d04828c47f33 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Wed, 27 Aug 2025 17:39:53 +0200
Subject: [PATCH 01/17] console: Add mac settings profiles list and create form

---
 .../components/mac-settings-section/index.js  | 135 ++--
 .../wifi-profiles/overview.js                 |   1 -
 .../form-validation.js                        | 330 +++++++++
 .../mac-settings-profile-form/index.js        | 636 ++++++++++++++++++
 .../mac-settings-profiles-table/index.js      | 116 ++++
 .../sidebar/navigation/app-side-navigation.js |   6 +
 .../store/actions/mac-settings-profiles.js    |  47 ++
 .../console/store/middleware/logics/index.js  |   2 +
 .../logics/mac-settings-profiles.js           |  48 ++
 pkg/webui/console/store/reducers/index.js     |   7 +
 .../store/reducers/mac-settings-profiles.js   |  51 ++
 .../store/selectors/mac-settings-profiles.js  |  30 +
 .../index.js                                  |  55 ++
 .../index.js                                  |  64 ++
 .../index.js                                  |  62 ++
 pkg/webui/console/views/application/index.js  |   2 +
 pkg/webui/lib/selectors/id.js                 |   3 +
 pkg/webui/lib/shared-messages.js              |  44 ++
 pkg/webui/locales/en.json                     |  89 +--
 pkg/webui/locales/ja.json                     |  87 +--
 sdk/js/src/index.js                           |   2 +
 .../network-server-mac-settings-profiles.js   |  50 ++
 22 files changed, 1693 insertions(+), 174 deletions(-)
 create mode 100644 pkg/webui/console/containers/mac-settings-profile-form/form-validation.js
 create mode 100644 pkg/webui/console/containers/mac-settings-profile-form/index.js
 create mode 100644 pkg/webui/console/containers/mac-settings-profiles-table/index.js
 create mode 100644 pkg/webui/console/store/actions/mac-settings-profiles.js
 create mode 100644 pkg/webui/console/store/middleware/logics/mac-settings-profiles.js
 create mode 100644 pkg/webui/console/store/reducers/mac-settings-profiles.js
 create mode 100644 pkg/webui/console/store/selectors/mac-settings-profiles.js
 create mode 100644 pkg/webui/console/views/application-mac-settings-profile-add/index.js
 create mode 100644 pkg/webui/console/views/application-mac-settings-profiles-list/index.js
 create mode 100644 pkg/webui/console/views/application-mac-settings-profiles/index.js
 create mode 100644 sdk/js/src/service/network-server-mac-settings-profiles.js

diff --git a/pkg/webui/console/components/mac-settings-section/index.js b/pkg/webui/console/components/mac-settings-section/index.js
index 979a2f865e..c14b283eb4 100644
--- a/pkg/webui/console/components/mac-settings-section/index.js
+++ b/pkg/webui/console/components/mac-settings-section/index.js
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import React, { useCallback } from 'react'
-import { defineMessages } from 'react-intl'
 import { createSelector } from 'reselect'
 import { useSelector } from 'react-redux'
 import { get, set } from 'lodash'
@@ -45,50 +44,6 @@ import getDataRate from '@console/lib/data-rate-utils'
 
 import { selectDataRates } from '@console/store/selectors/configuration'
 
-const m = defineMessages({
-  delayValue: '{count, plural, one {{count} second} other {{count} seconds}}',
-  factoryPresetFreqDescription: 'List of factory-preset frequencies. Note: order is respected.',
-  advancedMacSettings: 'Advanced MAC settings',
-  desiredPingSlotFrequencyTitle: 'Desired ping slot frequency',
-  pingSlotPeriodicityDescription: 'Periodicity of the class B ping slot',
-  pingSlotDataRateTitle: 'Ping slot data rate index',
-  desiredPingSlotDataRateTitle: 'Desired ping slot data rate',
-  resetWarning: 'Resetting is insecure and makes your device susceptible for replay attacks',
-  desiredRx1DataRateOffsetTitle: 'Desired Rx1 data rate offset',
-  desiredRx1DelayTitle: 'Desired Rx1 delay',
-  rx2DataRateIndexTitle: 'Rx2 data rate index',
-  desiredRx2DataRateIndexTitle: 'Desired Rx2 data rate index',
-  desiredRx2FrequencyTitle: 'Desired Rx2 frequency',
-  updateSuccess: 'The MAC settings updated',
-  desiredBeaconFrequency: 'Desired beacon frequency',
-  maxDutyCycle: 'Maximum duty cycle',
-  desiredMaxDutyCycle: 'Desired maximum duty cycle',
-  adrMargin: 'ADR margin',
-  adrUplinks: 'ADR number of transmissions',
-  adrAdaptiveDataRate: 'Adaptive data rate (ADR)',
-  adrDataRate: 'ADR data rate index',
-  adrTransPower: 'ADR transmission power index',
-  adrDynamic: 'Dynamic mode',
-  adrStatic: 'Static mode',
-  desiredAdrAckLimit: 'Desired ADR ack limit',
-  desiredAdrAckDelay: 'Desired ADR ack delay',
-  adrAckValue: '{count, plural, one {every message} other {every {count} messages}}',
-  statusCountPeriodicity: 'Status count periodicity',
-  statusTimePeriodicity: 'Status time periodicity',
-  dataRate: 'Data Rate {n}',
-  dataRatePlaceholder: 'Data Rate',
-  minNbTrans: 'Min. NbTrans',
-  maxNbTrans: 'Max. NbTrans',
-  useDefaultNbTrans: 'Use default settings for number of retransmissions',
-  adrNbTrans: 'ADR number of retransmissions (NbTrans)',
-  overrideNbTrans: 'Override server defaults for NbTrans (all data rates)',
-  defaultForAllRates: '(Default for all data rates)',
-  defaultNbTransMessage:
-    'Overriding the default is not required for using data rate overrides (below)',
-  specificOverrides: 'Data rate specific overrides',
-  addSpecificOverride: 'Add data rate specific override',
-})
-
 // 0...7
 const pingSlotPeriodicityOptions = Array.from({ length: 8 }, (_, index) => {
   const value = Math.pow(2, index)
@@ -104,7 +59,7 @@ const adrAckLimitOptions = Array.from({ length: 16 }, (_, index) => {
 
   return {
     value: `ADR_ACK_LIMIT_${value}`,
-    label: <Message content={m.adrAckValue} values={{ count: value }} />,
+    label: <Message content={sharedMessages.adrAckValue} values={{ count: value }} />,
   }
 })
 // 0...15
@@ -113,7 +68,7 @@ const adrAckDelayOptions = Array.from({ length: 16 }, (_, index) => {
 
   return {
     value: `ADR_ACK_DELAY_${value}`,
-    label: <Message content={m.adrAckValue} values={{ count: value }} />,
+    label: <Message content={sharedMessages.adrAckValue} values={{ count: value }} />,
   }
 })
 const maxDutyCycleOptions = [
@@ -162,8 +117,8 @@ const MacSettingsSection = props => {
   const isABP = activationMode === ACTIVATION_MODES.ABP
   const isMulticast = activationMode === ACTIVATION_MODES.MULTICAST
   const isOTAA = activationMode === ACTIVATION_MODES.OTAA
-  const isDynamicAdr = mac_settings.adr && 'dynamic' in mac_settings.adr
-  const isStaticAdr = mac_settings.adr && 'static' in mac_settings.adr
+  const isDynamicAdr = mac_settings?.adr && 'dynamic' in mac_settings?.adr
+  const isStaticAdr = mac_settings?.adr && 'static' in mac_settings?.adr
   const [resetsFCnt, setResetsFCnt] = React.useState(isABP && initialFCnt)
   const handleResetsFCntChange = React.useCallback(evt => {
     const { checked } = evt.target
@@ -190,9 +145,9 @@ const MacSettingsSection = props => {
     }
   }, [handleIsCollapsedChange, isABP, isClassB, isCollapsed, isMulticast, pingPeriodicityRequired])
 
-  const adrOverrides = mac_settings.adr.dynamic?.overrides
-  const showEditNbTrans = !values.mac_settings.adr.dynamic?._use_default_nb_trans
-  const defaultNbTransDisabled = !values.mac_settings.adr.dynamic?._override_nb_trans_defaults
+  const adrOverrides = mac_settings?.adr.dynamic?.overrides
+  const showEditNbTrans = !values.mac_settings?.adr.dynamic?._use_default_nb_trans
+  const defaultNbTransDisabled = !values.mac_settings?.adr.dynamic?._override_nb_trans_defaults
   const addOverride = React.useCallback(() => {
     const newOverride = { _data_rate_index: '', min_nb_trans: '', max_nb_trans: '' }
     setFieldValue(
@@ -252,7 +207,7 @@ const MacSettingsSection = props => {
   return (
     <Form.CollapseSection
       id="mac-settings"
-      title={m.advancedMacSettings}
+      title={sharedMessages.advancedMacSettings}
       initiallyCollapsed={initiallyCollapsed}
       onCollapse={handleIsCollapsedChange}
       isCollapsed={isCollapsed}
@@ -288,7 +243,7 @@ const MacSettingsSection = props => {
             )}
             {!isMulticast && (
               <Form.Field
-                title={m.desiredRx1DelayTitle}
+                title={sharedMessages.desiredRx1DelayTitle}
                 type="number"
                 name="mac_settings.desired_rx1_delay"
                 append={<Message content={sharedMessages.secondsAbbreviated} />}
@@ -317,7 +272,7 @@ const MacSettingsSection = props => {
             )}
             {!isMulticast && (
               <Form.Field
-                title={m.desiredRx1DataRateOffsetTitle}
+                title={sharedMessages.desiredRx1DataRateOffsetTitle}
                 type="number"
                 inputWidth="xxs"
                 fieldWidth="xs"
@@ -333,7 +288,7 @@ const MacSettingsSection = props => {
             <Form.Field
               label={sharedMessages.resetsFCnt}
               onChange={handleResetsFCntChange}
-              warning={resetsFCnt ? m.resetWarning : undefined}
+              warning={resetsFCnt ? sharedMessages.resetFCntWarning : undefined}
               name="mac_settings.resets_f_cnt"
               tooltipId={tooltipIds.RESETS_F_CNT}
               component={Checkbox}
@@ -344,7 +299,7 @@ const MacSettingsSection = props => {
       <Form.FieldContainer horizontal>
         {!isOTAA && (
           <Form.Field
-            title={m.rx2DataRateIndexTitle}
+            title={sharedMessages.rx2DataRateIndexTitle}
             type="number"
             name="mac_settings.rx2_data_rate_index"
             component={Input}
@@ -357,7 +312,7 @@ const MacSettingsSection = props => {
         )}
         {!isMulticast && (
           <Form.Field
-            title={m.desiredRx2DataRateIndexTitle}
+            title={sharedMessages.desiredRx2DataRateIndexTitle}
             type="number"
             name="mac_settings.desired_rx2_data_rate_index"
             component={Input}
@@ -387,7 +342,7 @@ const MacSettingsSection = props => {
             type="number"
             min={100000}
             step={100}
-            title={m.desiredRx2FrequencyTitle}
+            title={sharedMessages.desiredRx2FrequencyTitle}
             name="mac_settings.desired_rx2_frequency"
             component={UnitInput.Hertz}
             tooltipId={tooltipIds.RX2_FREQUENCY}
@@ -398,7 +353,7 @@ const MacSettingsSection = props => {
       <Form.FieldContainer horizontal>
         {!isOTAA && (
           <Form.Field
-            title={m.maxDutyCycle}
+            title={sharedMessages.maxDutyCycle}
             name="mac_settings.max_duty_cycle"
             component={Select}
             options={maxDutyCycleOptions}
@@ -408,7 +363,7 @@ const MacSettingsSection = props => {
         )}
         {!isMulticast && (
           <Form.Field
-            title={m.desiredMaxDutyCycle}
+            title={sharedMessages.desiredMaxDutyCycle}
             name="mac_settings.desired_max_duty_cycle"
             component={Select}
             options={maxDutyCycleOptions}
@@ -422,7 +377,7 @@ const MacSettingsSection = props => {
         name="mac_settings.factory_preset_frequencies"
         component={KeyValueMap}
         title={sharedMessages.factoryPresetFrequencies}
-        description={m.factoryPresetFreqDescription}
+        description={sharedMessages.factoryPresetFreqDescription}
         addMessage={sharedMessages.freqAdd}
         valuePlaceholder={sharedMessages.frequencyPlaceholder}
         tooltipId={tooltipIds.FACTORY_PRESET_FREQUENCIES}
@@ -451,7 +406,7 @@ const MacSettingsSection = props => {
           />
           <Form.Field
             title={sharedMessages.pingSlotPeriodicity}
-            description={m.pingSlotPeriodicityDescription}
+            description={sharedMessages.pingSlotPeriodicityDescription}
             name="mac_settings.ping_slot_periodicity"
             component={Select}
             options={pingSlotPeriodicityOptions}
@@ -476,7 +431,7 @@ const MacSettingsSection = props => {
               <Form.Field
                 type="number"
                 min={100000}
-                title={m.desiredBeaconFrequency}
+                title={sharedMessages.desiredBeaconFrequency}
                 placeholder={sharedMessages.frequencyPlaceholder}
                 name="mac_settings.desired_beacon_frequency"
                 tooltipId={tooltipIds.BEACON_FREQUENCY}
@@ -504,7 +459,7 @@ const MacSettingsSection = props => {
                 type="number"
                 min={100000}
                 step={100}
-                title={m.desiredPingSlotFrequencyTitle}
+                title={sharedMessages.desiredPingSlotFrequencyTitle}
                 placeholder={sharedMessages.frequencyPlaceholder}
                 name="mac_settings.desired_ping_slot_frequency"
                 tooltipId={tooltipIds.PING_SLOT_FREQUENCY}
@@ -516,7 +471,7 @@ const MacSettingsSection = props => {
           <Form.FieldContainer horizontal>
             {!isOTAA && (
               <Form.Field
-                title={m.pingSlotDataRateTitle}
+                title={sharedMessages.pingSlotDataRateTitle}
                 name="mac_settings.ping_slot_data_rate_index"
                 tooltipId={tooltipIds.PING_SLOT_DATA_RATE_INDEX}
                 component={Input}
@@ -529,7 +484,7 @@ const MacSettingsSection = props => {
             )}
             {!isMulticast && (
               <Form.Field
-                title={m.desiredPingSlotDataRateTitle}
+                title={sharedMessages.desiredPingSlotDataRateTitle}
                 name="mac_settings.desired_ping_slot_data_rate_index"
                 tooltipId={tooltipIds.PING_SLOT_DATA_RATE_INDEX}
                 component={Input}
@@ -545,7 +500,7 @@ const MacSettingsSection = props => {
       )}
       <Form.FieldContainer horizontal>
         <Form.Field
-          title={m.statusCountPeriodicity}
+          title={sharedMessages.statusCountPeriodicity}
           name="mac_settings.status_count_periodicity"
           component={Input}
           append={<Message content={sharedMessages.messages} />}
@@ -555,7 +510,7 @@ const MacSettingsSection = props => {
           tooltipId={tooltipIds.STATUS_COUNT_PERIODICITY}
         />
         <Form.Field
-          title={m.statusTimePeriodicity}
+          title={sharedMessages.statusTimePeriodicity}
           name="mac_settings.status_time_periodicity"
           component={UnitInput.Duration}
           unitSelector={['ms', 's']}
@@ -567,19 +522,19 @@ const MacSettingsSection = props => {
       <Form.Field
         name="mac_settings.adr"
         component={Radio.Group}
-        title={m.adrAdaptiveDataRate}
+        title={sharedMessages.adrAdaptiveDataRate}
         tooltipId={tooltipIds.ADR_USE}
         encode={encodeAdrMode}
         decode={decodeAdrMode}
       >
-        <Radio label={m.adrDynamic} value="dynamic" />
-        <Radio label={m.adrStatic} value="static" />
+        <Radio label={sharedMessages.adrDynamic} value="dynamic" />
+        <Radio label={sharedMessages.adrStatic} value="static" />
         <Radio label={sharedMessages.disabled} value="disabled" />
       </Form.Field>
       {isDynamicAdr && (
         <>
           <Form.Field
-            title={m.adrMargin}
+            title={sharedMessages.adrMargin}
             name="mac_settings.adr.dynamic.margin"
             component={Input}
             type="number"
@@ -590,7 +545,7 @@ const MacSettingsSection = props => {
             append="dB"
           />
           <Form.Field
-            label={m.useDefaultNbTrans}
+            label={sharedMessages.useDefaultNbTrans}
             name="mac_settings.adr.dynamic._use_default_nb_trans"
             component={Checkbox}
             tooltipId={tooltipIds.USE_DEFAULT_NB_TRANS}
@@ -598,14 +553,14 @@ const MacSettingsSection = props => {
           {showEditNbTrans && (
             <>
               <Form.Field
-                title={m.adrNbTrans}
+                title={sharedMessages.adrNbTrans}
                 name="mac_settings.adr.dynamic._override_nb_trans_defaults"
                 component={Checkbox}
-                label={m.overrideNbTrans}
+                label={sharedMessages.overrideNbTrans}
               />
               <Form.FieldContainer horizontal className="al-end mb-cs-xs">
                 <Form.Field
-                  title={m.minNbTrans}
+                  title={sharedMessages.minNbTrans}
                   name="mac_settings.adr.dynamic.min_nb_trans"
                   component={Input}
                   type="number"
@@ -616,7 +571,7 @@ const MacSettingsSection = props => {
                   className="d-flex direction-column"
                 />
                 <Form.Field
-                  title={m.maxNbTrans}
+                  title={sharedMessages.maxNbTrans}
                   name="mac_settings.adr.dynamic.max_nb_trans"
                   component={Input}
                   type="number"
@@ -626,16 +581,16 @@ const MacSettingsSection = props => {
                   inputWidth="xs"
                   className="d-flex direction-column"
                 />
-                <Message content={m.defaultForAllRates} className="mt-cs-xl" />
+                <Message content={sharedMessages.defaultForAllRates} className="mt-cs-xl" />
               </Form.FieldContainer>
               {!defaultNbTransDisabled && (
                 <div>
                   <Icon icon="info" nudgeUp className="mr-cs-xxs" />
-                  <Message content={m.defaultNbTransMessage} />
+                  <Message content={sharedMessages.defaultNbTransMessage} />
                 </div>
               )}
               <Form.InfoField
-                title={m.specificOverrides}
+                title={sharedMessages.specificOverrides}
                 tooltipId={tooltipIds.DATA_RATE_SPECIFIC_OVERRIDES}
                 className="mt-cs-m"
               >
@@ -643,7 +598,7 @@ const MacSettingsSection = props => {
                   Object.keys(adrOverrides).map(index => (
                     <Form.FieldContainer horizontal className="al-end" key={index}>
                       <Form.Field
-                        title={m.dataRatePlaceholder}
+                        title={sharedMessages.dataRatePlaceholder}
                         name={`mac_settings.adr.dynamic.overrides.${index}._data_rate_index`}
                         valueSetter={dataRateValueSetter}
                         component={Select}
@@ -654,7 +609,7 @@ const MacSettingsSection = props => {
                         className="d-flex direction-column"
                       />
                       <Form.Field
-                        title={m.minNbTrans}
+                        title={sharedMessages.minNbTrans}
                         name={`mac_settings.adr.dynamic.overrides.${index}.min_nb_trans`}
                         component={Input}
                         fieldWidth="xxs"
@@ -664,7 +619,7 @@ const MacSettingsSection = props => {
                         max={3}
                       />
                       <Form.Field
-                        title={m.maxNbTrans}
+                        title={sharedMessages.maxNbTrans}
                         name={`mac_settings.adr.dynamic.overrides.${index}.max_nb_trans`}
                         component={Input}
                         fieldWidth="xxs"
@@ -684,7 +639,7 @@ const MacSettingsSection = props => {
                   ))}
                 <Button
                   type="button"
-                  message={m.addSpecificOverride}
+                  message={sharedMessages.addSpecificOverride}
                   onClick={addOverride}
                   icon="add"
                 />
@@ -696,14 +651,14 @@ const MacSettingsSection = props => {
       {isStaticAdr && (
         <>
           <Form.Field
-            title={m.adrDataRate}
+            title={sharedMessages.adrDataRate}
             name="mac_settings.adr.static.data_rate_index"
             component={Input}
             type="number"
             inputWidth="xs"
           />
           <Form.Field
-            title={m.adrTransPower}
+            title={sharedMessages.adrTransPower}
             name="mac_settings.adr.static.tx_power_index"
             component={Input}
             type="number"
@@ -711,7 +666,7 @@ const MacSettingsSection = props => {
             max={15}
           />
           <Form.Field
-            title={m.adrUplinks}
+            title={sharedMessages.adrUplinks}
             name="mac_settings.adr.static.nb_trans"
             component={Input}
             type="number"
@@ -724,7 +679,7 @@ const MacSettingsSection = props => {
       {isNewLorawanVersion && !isMulticast && (
         <>
           <Form.Field
-            title={m.desiredAdrAckLimit}
+            title={sharedMessages.desiredAdrAckLimit}
             name="mac_settings.desired_adr_ack_limit_exponent"
             component={Select}
             options={adrAckLimitOptions}
@@ -732,7 +687,7 @@ const MacSettingsSection = props => {
             fieldWidth="xs"
           />
           <Form.Field
-            title={m.desiredAdrAckDelay}
+            title={sharedMessages.desiredAdrAckDelay}
             name="mac_settings.desired_adr_ack_delay_exponent"
             component={Select}
             options={adrAckDelayOptions}
diff --git a/pkg/webui/console/containers/gateway-managed-gateway/wifi-profiles/overview.js b/pkg/webui/console/containers/gateway-managed-gateway/wifi-profiles/overview.js
index 6942b711ae..4bb79fec42 100644
--- a/pkg/webui/console/containers/gateway-managed-gateway/wifi-profiles/overview.js
+++ b/pkg/webui/console/containers/gateway-managed-gateway/wifi-profiles/overview.js
@@ -52,7 +52,6 @@ const m = defineMessages({
   information:
     'Connection profiles are setup to allow for multiple gateways to connect via the same settings. You can use this view to manage all your profiles or create new ones, after which you can assign them to your gateway.',
   accessPoint: 'Access point',
-  deleteProfile: 'Delete profile',
   deleteSuccess: 'WiFi profile deleted',
   deleteFail: 'There was an error and the WiFi profile could not be deleted',
   deleteModalMessage:
diff --git a/pkg/webui/console/containers/mac-settings-profile-form/form-validation.js b/pkg/webui/console/containers/mac-settings-profile-form/form-validation.js
new file mode 100644
index 0000000000..1d62ca0eb2
--- /dev/null
+++ b/pkg/webui/console/containers/mac-settings-profile-form/form-validation.js
@@ -0,0 +1,330 @@
+// Copyright © 2025 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import Yup from '@ttn-lw/lib/yup'
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+const dynamicFrequencyTest = value => value === 0 || value >= 100000 || value === null
+
+export const initialValues = {
+  ids: {
+    profile_id: '',
+  },
+  mac_settings: {
+    beacon_frequency: null,
+    desired_beacon_frequency: null,
+    class_b_timeout: null,
+    class_c_timeout: null,
+    rx1_delay: 1,
+    desired_rx1_delay: 1,
+    rx1_data_rate_offset: 0,
+    desired_rx1_data_rate_offset: 0,
+    resets_f_cnt: false,
+    ping_slot_data_rate_index: 0,
+    desired_ping_slot_data_rate_index: 0,
+    rx2_data_rate_index: 0,
+    desired_rx2_data_rate_index: 0,
+    rx2_frequency: null,
+    ping_slot_periodicity: null,
+    desired_rx2_frequency: null,
+    ping_slot_frequency: null,
+    desired_ping_slot_frequency: null,
+    factory_preset_frequencies: [],
+    supports_32_bit_f_cnt: true,
+    max_duty_cycle: null,
+    desired_max_duty_cycle: '',
+    adr: {
+      dynamic: {
+        _use_default_nb_trans: true,
+        margin: undefined,
+        _override_nb_trans_defaults: false,
+      },
+    },
+    desired_adr_ack_limit_exponent: null,
+    desired_adr_ack_delay_exponent: null,
+    status_time_periodicity: '',
+    status_count_periodicity: null,
+  },
+}
+
+const factoryPresetFreqNumericTest = frequencies =>
+  frequencies.every(freq => {
+    if (typeof freq !== 'undefined') {
+      return !isNaN(parseInt(freq))
+    }
+
+    return true
+  })
+
+const factoryPresetFreqRequiredTest = frequencies =>
+  frequencies.every(freq => typeof freq !== 'undefined' && freq !== '')
+
+export const validationSchema = Yup.object().shape({
+  ids: Yup.object().shape({
+    profile_id: Yup.string().required(sharedMessages.validateRequired),
+  }),
+  mac_settings: Yup.object().shape({
+    beacon_frequency: Yup.number()
+      .nullable()
+      .test('is-valid-freq', sharedMessages.validateFreqDynamic, dynamicFrequencyTest),
+    desired_beacon_frequency: Yup.number()
+      .nullable()
+      .test('is-valid-freq', sharedMessages.validateFreqDynamic, dynamicFrequencyTest),
+    class_b_timeout: Yup.lazy(value => {
+      if (!Boolean(value)) {
+        return Yup.string().strip()
+      }
+
+      return Yup.string()
+    }),
+    class_c_timeout: Yup.lazy(value => {
+      if (!Boolean(value)) {
+        return Yup.string().strip()
+      }
+
+      return Yup.string()
+    }),
+    rx1_delay: Yup.lazy(delay => {
+      if (delay === undefined || delay === '') {
+        return Yup.number().strip()
+      }
+
+      return Yup.number()
+        .min(1, Yup.passValues(sharedMessages.validateNumberGte))
+        .max(15, Yup.passValues(sharedMessages.validateNumberLte))
+    }),
+    desired_rx1_delay: Yup.lazy(delay => {
+      if (delay === undefined || delay === '') {
+        return Yup.number().strip()
+      }
+
+      return Yup.number()
+        .min(1, Yup.passValues(sharedMessages.validateNumberGte))
+        .max(15, Yup.passValues(sharedMessages.validateNumberLte))
+    }),
+    rx1_data_rate_offset: Yup.lazy(value => {
+      if (value === undefined || value === '') {
+        return Yup.number().strip()
+      }
+
+      return Yup.number()
+        .min(0, Yup.passValues(sharedMessages.validateNumberGte))
+        .max(7, Yup.passValues(sharedMessages.validateNumberLte))
+    }),
+    desired_rx1_data_rate_offset: Yup.lazy(value => {
+      if (value === undefined || value === '') {
+        return Yup.number().strip()
+      }
+
+      return Yup.number()
+        .min(0, Yup.passValues(sharedMessages.validateNumberGte))
+        .max(7, Yup.passValues(sharedMessages.validateNumberLte))
+    }),
+    resets_f_cnt: Yup.boolean().default(false),
+    ping_slot_data_rate_index: Yup.lazy(dataRate => {
+      if (dataRate === '' || dataRate === undefined) {
+        return Yup.number().strip()
+      }
+
+      return Yup.number()
+        .min(0, Yup.passValues(sharedMessages.validateNumberGte))
+        .max(15, Yup.passValues(sharedMessages.validateNumberLte))
+    }),
+    desired_ping_slot_data_rate_index: Yup.lazy(dataRate => {
+      if (dataRate === '' || dataRate === undefined) {
+        return Yup.number().strip()
+      }
+
+      return Yup.number()
+        .min(0, Yup.passValues(sharedMessages.validateNumberGte))
+        .max(15, Yup.passValues(sharedMessages.validateNumberLte))
+    }),
+    rx2_data_rate_index: Yup.lazy(dataRate => {
+      if (dataRate === '' || dataRate === undefined) {
+        return Yup.number().strip()
+      }
+
+      return Yup.number()
+        .min(0, Yup.passValues(sharedMessages.validateNumberGte))
+        .max(15, Yup.passValues(sharedMessages.validateNumberLte))
+    }),
+    desired_rx2_data_rate_index: Yup.lazy(dataRate => {
+      if (dataRate === '' || dataRate === undefined) {
+        return Yup.number().strip()
+      }
+
+      return Yup.number()
+        .nullable()
+        .min(0, Yup.passValues(sharedMessages.validateNumberGte))
+        .max(15, Yup.passValues(sharedMessages.validateNumberLte))
+    }),
+    rx2_frequency: Yup.lazy(frequency => {
+      if (frequency === undefined || frequency === '') {
+        return Yup.number().strip()
+      }
+      return Yup.number().min(100000, Yup.passValues(sharedMessages.validateNumberGte)).nullable()
+    }),
+    ping_slot_periodicity: Yup.string().nullable(),
+    desired_rx2_frequency: Yup.lazy(frequency => {
+      if (frequency === undefined || frequency === '') {
+        return Yup.number().strip()
+      }
+      return Yup.number().min(100000, Yup.passValues(sharedMessages.validateNumberGte)).nullable()
+    }),
+    ping_slot_frequency: Yup.number()
+      .test('is-valid-freq', sharedMessages.validateFreqDynamic, dynamicFrequencyTest)
+      .nullable(),
+    desired_ping_slot_frequency: Yup.lazy(frequency => {
+      if (!Boolean(frequency)) {
+        return Yup.number().strip()
+      }
+
+      return Yup.number().test(
+        'is-valid-freq',
+        sharedMessages.validateFreqDynamic,
+        dynamicFrequencyTest,
+      )
+    }),
+    factory_preset_frequencies: Yup.lazy(frequencies => {
+      if (!Boolean(frequencies)) {
+        return Yup.array().strip()
+      }
+
+      return Yup.array()
+        .default([])
+        .test(
+          'is-valid-frequency',
+          sharedMessages.validateFreqNumberic,
+          factoryPresetFreqNumericTest,
+        )
+        .test(
+          'is-empty-frequency',
+          sharedMessages.validateFreqRequired,
+          factoryPresetFreqRequiredTest,
+        )
+    }),
+    supports_32_bit_f_cnt: Yup.boolean().default(true),
+    max_duty_cycle: Yup.string().nullable(),
+    desired_max_duty_cycle: Yup.lazy(value => {
+      if (!Boolean(value)) {
+        return Yup.string().strip()
+      }
+
+      return Yup.string()
+    }),
+    adr: Yup.lazy(value => {
+      if (value && 'static' in value) {
+        return Yup.object().shape({
+          static: Yup.object().shape({
+            data_rate_index: Yup.number().nullable(),
+            tx_power_index: Yup.number()
+              .nullable()
+              .max(15, Yup.passValues(sharedMessages.validateNumberLte)),
+            nb_trans: Yup.number()
+              .nullable()
+              .min(1, Yup.passValues(sharedMessages.validateNumberGte))
+              .max(15, Yup.passValues(sharedMessages.validateNumberLte)),
+          }),
+        })
+      } else if (value && 'disabled' in value) {
+        return Yup.object().shape({
+          disabled: Yup.object().shape({}).noUnknown(),
+        })
+      }
+
+      return Yup.object().shape({
+        dynamic: Yup.lazy(value =>
+          Yup.object().shape({
+            margin: Yup.number().nullable(),
+            min_nb_trans: Yup.number()
+              .min(1, Yup.passValues(sharedMessages.validateNumberGte))
+              .max(value?.max_nb_trans || 3, Yup.passValues(sharedMessages.validateNumberLte))
+              .nullable(),
+            max_nb_trans: Yup.number()
+              .min(value?.min_nb_trans || 1, Yup.passValues(sharedMessages.validateNumberGte))
+              .max(3, Yup.passValues(sharedMessages.validateNumberLte))
+              .nullable(),
+            overrides: Yup.lazy(value => {
+              if (!Boolean(value)) {
+                return Yup.object().nullable()
+              }
+
+              return Yup.object().shape(
+                Object.keys(value).reduce((acc, key) => {
+                  acc[key] = Yup.object().shape({
+                    _data_rate_index: Yup.string().default(key.startsWith('_') ? null : key),
+                    min_nb_trans: Yup.lazy(value => {
+                      if (value === undefined) {
+                        return Yup.number().strip()
+                      }
+
+                      return Yup.number()
+                        .min(1, Yup.passValues(sharedMessages.validateNumberGte))
+                        .max(
+                          value[key]?.max_nb_trans || 3,
+                          Yup.passValues(sharedMessages.validateNumberLte),
+                        )
+                    }),
+                    max_nb_trans: Yup.lazy(value => {
+                      if (value === undefined) {
+                        return Yup.number().strip()
+                      }
+
+                      return Yup.number()
+                        .min(
+                          value[key]?.min_nb_trans || 1,
+                          Yup.passValues(sharedMessages.validateNumberGte),
+                        )
+                        .max(3, Yup.passValues(sharedMessages.validateNumberLte))
+                    }),
+                  })
+
+                  return acc
+                }, {}),
+              )
+            }),
+          }),
+        ),
+      })
+    }),
+    desired_adr_ack_limit_exponent: Yup.string().when(['adr'], ([adr], schema) => {
+      if (!('dynamic' in adr)) {
+        return schema.strip()
+      }
+
+      return schema.nullable()
+    }),
+    desired_adr_ack_delay_exponent: Yup.string().when(['adr'], ([adr], schema) => {
+      if (!('dynamic' in adr)) {
+        return schema.strip()
+      }
+
+      return schema.nullable()
+    }),
+    status_time_periodicity: Yup.lazy(value => {
+      if (!Boolean(value)) {
+        return Yup.string().strip()
+      }
+
+      return Yup.string()
+    }),
+    status_count_periodicity: Yup.lazy(value => {
+      if (value === undefined || value === '') {
+        return Yup.number().strip()
+      }
+
+      return Yup.number().nullable()
+    }),
+  }),
+})
diff --git a/pkg/webui/console/containers/mac-settings-profile-form/index.js b/pkg/webui/console/containers/mac-settings-profile-form/index.js
new file mode 100644
index 0000000000..76158eb702
--- /dev/null
+++ b/pkg/webui/console/containers/mac-settings-profile-form/index.js
@@ -0,0 +1,636 @@
+// Copyright © 2025 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import React, { useCallback, useState } from 'react'
+import { get, set } from 'lodash'
+import { useDispatch } from 'react-redux'
+import { useParams } from 'react-router-dom'
+
+import Form, { useFormContext } from '@ttn-lw/components/form'
+import Radio from '@ttn-lw/components/radio-button'
+import Input from '@ttn-lw/components/input'
+import Checkbox from '@ttn-lw/components/checkbox'
+import UnitInput from '@ttn-lw/components/unit-input'
+import Select from '@ttn-lw/components/select'
+import KeyValueMap from '@ttn-lw/components/key-value-map'
+import Icon, { IconPlus, IconTrash } from '@ttn-lw/components/icon'
+import Button from '@ttn-lw/components/button'
+import SubmitBar from '@ttn-lw/components/submit-bar'
+import SubmitButton from '@ttn-lw/components/submit-button'
+import toast from '@ttn-lw/components/toast'
+
+import Message from '@ttn-lw/lib/components/message'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import tooltipIds from '@ttn-lw/lib/constants/tooltip-ids'
+import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
+
+import { FRAME_WIDTH_COUNT, fCntWidthEncode, fCntWidthDecode } from '@console/lib/device-utils'
+
+import { createMacSettingsProfile } from '@console/store/actions/mac-settings-profiles'
+
+import { validationSchema, initialValues } from './form-validation'
+
+// 0...7
+const pingSlotPeriodicityOptions = Array.from({ length: 8 }, (_, index) => {
+  const value = Math.pow(2, index)
+
+  return {
+    value: `PING_EVERY_${value}S`,
+    label: <Message content={sharedMessages.secondInterval} values={{ count: value }} />,
+  }
+})
+// 0...15
+const adrAckLimitOptions = Array.from({ length: 16 }, (_, index) => {
+  const value = Math.pow(2, index)
+
+  return {
+    value: `ADR_ACK_LIMIT_${value}`,
+    label: <Message content={sharedMessages.adrAckValue} values={{ count: value }} />,
+  }
+})
+// 0...15
+const adrAckDelayOptions = Array.from({ length: 16 }, (_, index) => {
+  const value = Math.pow(2, index)
+
+  return {
+    value: `ADR_ACK_DELAY_${value}`,
+    label: <Message content={sharedMessages.adrAckValue} values={{ count: value }} />,
+  }
+})
+const maxDutyCycleOptions = [
+  { value: 'DUTY_CYCLE_1', label: '100%' },
+  { value: 'DUTY_CYCLE_16', label: '6.25%' },
+  { value: 'DUTY_CYCLE_128', label: '0.781%' },
+  { value: 'DUTY_CYCLE_1024', label: '0.098%' },
+  { value: 'DUTY_CYCLE_16384', label: '0.006%' },
+]
+
+const MACSettingsProfileInnerForm = () => {
+  const { values, setFieldValue, setFieldTouched } = useFormContext()
+  const { mac_settings } = values
+  const [resetsFCnt, setResetsFCnt] = useState(false)
+  const handleResetsFCntChange = useCallback(evt => {
+    const { checked } = evt.target
+
+    setResetsFCnt(checked)
+  }, [])
+  const alreadySelectedDataRates = Object.keys(mac_settings?.adr?.dynamic?.overrides || [])
+  const dataRateOverrideOptions = []
+  // Filter out the already selected data rate indices.
+  const dataRateFilterOption = useCallback(
+    option => !alreadySelectedDataRates.includes(option.value),
+    [alreadySelectedDataRates],
+  )
+
+  const isDynamicAdr = mac_settings?.adr && 'dynamic' in mac_settings?.adr
+  const isStaticAdr = mac_settings?.adr && 'static' in mac_settings?.adr
+  const adrOverrides = mac_settings?.adr.dynamic?.overrides
+  const showEditNbTrans = !values.mac_settings?.adr.dynamic?._use_default_nb_trans
+  const defaultNbTransDisabled = !values.mac_settings?.adr.dynamic?._override_nb_trans_defaults
+  const addOverride = useCallback(() => {
+    const newOverride = { _data_rate_index: '', min_nb_trans: '', max_nb_trans: '' }
+    setFieldValue(
+      'mac_settings.adr.dynamic.overrides',
+      adrOverrides
+        ? { ...adrOverrides, [`_empty-${Date.now()}`]: newOverride }
+        : { [`_empty-${Date.now()}`]: newOverride },
+    )
+    setFieldTouched('mac_settings.adr.dynamic._overrides', true)
+  }, [setFieldValue, adrOverrides, setFieldTouched])
+  const handleRemoveButtonClick = useCallback(
+    (_, index) => {
+      setFieldValue(
+        'mac_settings.adr.dynamic.overrides',
+        Object.keys(adrOverrides)
+          .filter(key => key !== index)
+          .reduce((acc, key) => ({ ...acc, [key]: adrOverrides[key] }), {}),
+      )
+    },
+    [adrOverrides, setFieldValue],
+  )
+
+  // Define a value setter for the data rate index field which
+  // handles setting the object keys correctly, since the index
+  // is set as the object key in the API schema.
+  // A similar result could be done without pseudo values, purely
+  // with decoder/encoder, but it would make error mapping
+  // more complex.
+  const dataRateValueSetter = useCallback(
+    ({ setValues }, { name, value }) => {
+      const index = name.split('.').slice(-2)[0] // Would be: data_rate_{x}.
+      const oldOverride = get(values, `mac_settings.adr.dynamic.overrides.${index}`, {})
+      const overrides = { ...get(values, 'mac_settings.adr.dynamic.overrides', {}) }
+      // Empty data rate index objects, are stored with a pseudo key. Remove it.
+      delete overrides[index]
+      // Move the existing values to the new data rate key.
+      overrides[value] = { ...oldOverride, _data_rate_index: value }
+      setValues(values => set(values, 'mac_settings.adr.dynamic.overrides', overrides))
+    },
+    [values],
+  )
+
+  const getEncodedAdrModeValue = useCallback(mode => {
+    if (mode === 'static') {
+      return {
+        data_rate_index: 0,
+        tx_power_index: 0,
+        nb_trans: 1,
+      }
+    }
+    return {}
+  }, [])
+
+  const encodeAdrMode = value => ({ [value]: getEncodedAdrModeValue(value) })
+  const decodeAdrMode = value => (value !== undefined ? Object.keys(value)[0] : null)
+
+  return (
+    <>
+      <Form.Field
+        title={'Profile ID'}
+        name="ids.profile_id"
+        component={Input}
+        required
+        fieldWidth="half"
+      />
+      <Form.Field
+        title={sharedMessages.frameCounterWidth}
+        name="mac_settings.supports_32_bit_f_cnt"
+        component={Radio.Group}
+        encode={fCntWidthEncode}
+        decode={fCntWidthDecode}
+        tooltipId={tooltipIds.FRAME_COUNTER_WIDTH}
+        horizontal
+      >
+        <Radio label={sharedMessages['16Bit']} value={FRAME_WIDTH_COUNT.SUPPORTS_16_BIT} />
+        <Radio label={sharedMessages['32Bit']} value={FRAME_WIDTH_COUNT.SUPPORTS_32_BIT} />
+      </Form.Field>
+      <Form.FieldContainer horizontal>
+        <Form.Field
+          title={sharedMessages.rx1Delay}
+          type="number"
+          tooltipId={tooltipIds.RX1_DELAY}
+          append={<Message content={sharedMessages.secondsAbbreviated} />}
+          name="mac_settings.rx1_delay"
+          component={Input}
+          min={1}
+          max={15}
+          fieldWidth="half"
+        />
+        <Form.Field
+          title={sharedMessages.desiredRx1DelayTitle}
+          type="number"
+          name="mac_settings.desired_rx1_delay"
+          append={<Message content={sharedMessages.secondsAbbreviated} />}
+          tooltipId={tooltipIds.RX1_DELAY}
+          component={Input}
+          min={1}
+          max={15}
+          fieldWidth="half"
+        />
+      </Form.FieldContainer>
+      <Form.FieldContainer horizontal>
+        <Form.Field
+          title={sharedMessages.rx1DataRateOffset}
+          type="number"
+          name="mac_settings.rx1_data_rate_offset"
+          component={Input}
+          min={0}
+          max={7}
+          tooltipId={tooltipIds.DATA_RATE_OFFSET}
+          fieldWidth="half"
+        />
+        <Form.Field
+          title={sharedMessages.desiredRx1DataRateOffsetTitle}
+          type="number"
+          name="mac_settings.desired_rx1_data_rate_offset"
+          component={Input}
+          min={0}
+          max={7}
+          tooltipId={tooltipIds.DATA_RATE_OFFSET}
+          fieldWidth="half"
+        />
+      </Form.FieldContainer>
+      <Form.Field
+        label={sharedMessages.resetsFCnt}
+        onChange={handleResetsFCntChange}
+        warning={resetsFCnt ? sharedMessages.resetFCntWarning : undefined}
+        name="mac_settings.resets_f_cnt"
+        tooltipId={tooltipIds.RESETS_F_CNT}
+        component={Checkbox}
+        fieldWidth="half"
+      />
+      <Form.FieldContainer horizontal>
+        <Form.Field
+          title={sharedMessages.rx2DataRateIndexTitle}
+          type="number"
+          name="mac_settings.rx2_data_rate_index"
+          component={Input}
+          min={0}
+          max={15}
+          tooltipId={tooltipIds.RX2_DATA_RATE_INDEX}
+          fieldWidth="half"
+        />
+        <Form.Field
+          title={sharedMessages.desiredRx2DataRateIndexTitle}
+          type="number"
+          name="mac_settings.desired_rx2_data_rate_index"
+          component={Input}
+          min={0}
+          max={15}
+          tooltipId={tooltipIds.RX2_DATA_RATE_INDEX}
+          fieldWidth="half"
+        />
+      </Form.FieldContainer>
+      <Form.FieldContainer horizontal>
+        <Form.Field
+          type="number"
+          min={100000}
+          step={100}
+          title={sharedMessages.rx2Frequency}
+          name="mac_settings.rx2_frequency"
+          component={UnitInput.Hertz}
+          tooltipId={tooltipIds.RX2_FREQUENCY}
+          fieldWidth="half"
+        />
+        <Form.Field
+          type="number"
+          min={100000}
+          step={100}
+          title={sharedMessages.desiredRx2FrequencyTitle}
+          name="mac_settings.desired_rx2_frequency"
+          component={UnitInput.Hertz}
+          tooltipId={tooltipIds.RX2_FREQUENCY}
+          fieldWidth="half"
+        />
+      </Form.FieldContainer>
+      <Form.FieldContainer horizontal>
+        <Form.Field
+          title={sharedMessages.maxDutyCycle}
+          name="mac_settings.max_duty_cycle"
+          component={Select}
+          options={maxDutyCycleOptions}
+          tooltipId={tooltipIds.MAX_DUTY_CYCLE}
+          fieldWidth="half"
+        />
+        <Form.Field
+          title={sharedMessages.desiredMaxDutyCycle}
+          name="mac_settings.desired_max_duty_cycle"
+          component={Select}
+          options={maxDutyCycleOptions}
+          tooltipId={tooltipIds.MAX_DUTY_CYCLE}
+          fieldWidth="half"
+        />
+      </Form.FieldContainer>
+      <Form.Field
+        indexAsKey
+        name="mac_settings.factory_preset_frequencies"
+        component={KeyValueMap}
+        title={sharedMessages.factoryPresetFrequencies}
+        description={sharedMessages.factoryPresetFreqDescription}
+        addMessage={sharedMessages.freqAdd}
+        valuePlaceholder={sharedMessages.frequencyPlaceholder}
+        tooltipId={tooltipIds.FACTORY_PRESET_FREQUENCIES}
+        fieldWidth="half"
+        className="flex-grow"
+      />
+      <Form.Field
+        title={sharedMessages.classCTimeout}
+        name="mac_settings.class_c_timeout"
+        tooltipId={tooltipIds.CLASS_C_TIMEOUT}
+        component={UnitInput.Duration}
+        unitSelector={['ms', 's']}
+        type="number"
+        fieldWidth="half"
+        selectWidth="full"
+      />
+      <Form.Field
+        title={sharedMessages.classBTimeout}
+        name="mac_settings.class_b_timeout"
+        tooltipId={tooltipIds.CLASS_B_TIMEOUT}
+        component={UnitInput.Duration}
+        unitSelector={['ms', 's']}
+        type="number"
+        fieldWidth="half"
+        selectWidth="full"
+      />
+      <Form.Field
+        title={sharedMessages.pingSlotPeriodicity}
+        description={sharedMessages.pingSlotPeriodicityDescription}
+        name="mac_settings.ping_slot_periodicity"
+        component={Select}
+        options={pingSlotPeriodicityOptions}
+        menuPlacement="top"
+        fieldWidth="half"
+      />
+      <Form.FieldContainer horizontal>
+        <Form.Field
+          type="number"
+          min={100000}
+          title={sharedMessages.beaconFrequency}
+          placeholder={sharedMessages.frequencyPlaceholder}
+          name="mac_settings.beacon_frequency"
+          tooltipId={tooltipIds.BEACON_FREQUENCY}
+          component={UnitInput.Hertz}
+          fieldWidth="half"
+        />
+        <Form.Field
+          type="number"
+          min={100000}
+          title={sharedMessages.desiredBeaconFrequency}
+          placeholder={sharedMessages.frequencyPlaceholder}
+          name="mac_settings.desired_beacon_frequency"
+          tooltipId={tooltipIds.BEACON_FREQUENCY}
+          component={UnitInput.Hertz}
+          fieldWidth="half"
+        />
+      </Form.FieldContainer>
+      <Form.FieldContainer horizontal>
+        <Form.Field
+          type="number"
+          min={100000}
+          step={100}
+          title={sharedMessages.pingSlotFrequency}
+          placeholder={sharedMessages.frequencyPlaceholder}
+          name="mac_settings.ping_slot_frequency"
+          tooltipId={tooltipIds.PING_SLOT_FREQUENCY}
+          component={UnitInput.Hertz}
+          fieldWidth="half"
+        />
+        <Form.Field
+          type="number"
+          min={100000}
+          step={100}
+          title={sharedMessages.desiredPingSlotFrequencyTitle}
+          placeholder={sharedMessages.frequencyPlaceholder}
+          name="mac_settings.desired_ping_slot_frequency"
+          tooltipId={tooltipIds.PING_SLOT_FREQUENCY}
+          component={UnitInput.Hertz}
+          fieldWidth="half"
+        />
+      </Form.FieldContainer>
+      <Form.FieldContainer horizontal>
+        <Form.Field
+          title={sharedMessages.pingSlotDataRateTitle}
+          name="mac_settings.ping_slot_data_rate_index"
+          tooltipId={tooltipIds.PING_SLOT_DATA_RATE_INDEX}
+          component={Input}
+          type="number"
+          min={0}
+          max={15}
+          fieldWidth="half"
+        />
+        <Form.Field
+          title={sharedMessages.desiredPingSlotDataRateTitle}
+          name="mac_settings.desired_ping_slot_data_rate_index"
+          tooltipId={tooltipIds.PING_SLOT_DATA_RATE_INDEX}
+          component={Input}
+          type="number"
+          min={0}
+          max={15}
+          fieldWidth="half"
+        />
+      </Form.FieldContainer>
+      <Form.FieldContainer horizontal>
+        <Form.Field
+          title={sharedMessages.statusCountPeriodicity}
+          name="mac_settings.status_count_periodicity"
+          component={Input}
+          append={<Message content={sharedMessages.messages} />}
+          type="number"
+          tooltipId={tooltipIds.STATUS_COUNT_PERIODICITY}
+          fieldWidth="half"
+        />
+        <Form.Field
+          title={sharedMessages.statusTimePeriodicity}
+          name="mac_settings.status_time_periodicity"
+          component={UnitInput.Duration}
+          unitSelector={['ms', 's']}
+          type="number"
+          tooltipId={tooltipIds.STATUS_TIME_PERIODICITY}
+          fieldWidth="half"
+          selectWidth="full"
+        />
+      </Form.FieldContainer>
+      <Form.Field
+        name="mac_settings.adr"
+        component={Radio.Group}
+        title={sharedMessages.adrAdaptiveDataRate}
+        tooltipId={tooltipIds.ADR_USE}
+        encode={encodeAdrMode}
+        decode={decodeAdrMode}
+      >
+        <Radio label={sharedMessages.adrDynamic} value="dynamic" />
+        <Radio label={sharedMessages.adrStatic} value="static" />
+        <Radio label={sharedMessages.disabled} value="disabled" />
+      </Form.Field>
+      {isDynamicAdr && (
+        <>
+          <Form.Field
+            title={sharedMessages.adrMargin}
+            name="mac_settings.adr.dynamic.margin"
+            component={Input}
+            type="number"
+            tooltipId={tooltipIds.ADR_MARGIN}
+            min={-100}
+            max={100}
+            append="dB"
+            fieldWidth="half"
+          />
+          <Form.Field
+            label={sharedMessages.useDefaultNbTrans}
+            name="mac_settings.adr.dynamic._use_default_nb_trans"
+            component={Checkbox}
+            tooltipId={tooltipIds.USE_DEFAULT_NB_TRANS}
+          />
+          {showEditNbTrans && (
+            <>
+              <Form.Field
+                title={sharedMessages.adrNbTrans}
+                name="mac_settings.adr.dynamic._override_nb_trans_defaults"
+                component={Checkbox}
+                label={sharedMessages.overrideNbTrans}
+              />
+              <Form.FieldContainer horizontal className="al-end mb-cs-xs">
+                <Form.Field
+                  title={sharedMessages.minNbTrans}
+                  name="mac_settings.adr.dynamic.min_nb_trans"
+                  component={Input}
+                  type="number"
+                  min={1}
+                  max={3}
+                  disabled={defaultNbTransDisabled}
+                  className="d-flex direction-column"
+                />
+                <Form.Field
+                  title={sharedMessages.maxNbTrans}
+                  name="mac_settings.adr.dynamic.max_nb_trans"
+                  component={Input}
+                  type="number"
+                  min={1}
+                  max={3}
+                  disabled={defaultNbTransDisabled}
+                  className="d-flex direction-column"
+                />
+                <Message content={sharedMessages.defaultForAllRates} className="mt-cs-xl" />
+              </Form.FieldContainer>
+              {!defaultNbTransDisabled && (
+                <div>
+                  <Icon icon="info" nudgeUp className="mr-cs-xxs" />
+                  <Message content={sharedMessages.defaultNbTransMessage} />
+                </div>
+              )}
+              <Form.InfoField
+                title={sharedMessages.specificOverrides}
+                tooltipId={tooltipIds.DATA_RATE_SPECIFIC_OVERRIDES}
+                className="mt-cs-m"
+              >
+                {adrOverrides &&
+                  Object.keys(adrOverrides).map(index => (
+                    <Form.FieldContainer horizontal className="al-end" key={index}>
+                      <Form.Field
+                        title={sharedMessages.dataRatePlaceholder}
+                        name={`mac_settings.adr.dynamic.overrides.${index}._data_rate_index`}
+                        valueSetter={dataRateValueSetter}
+                        component={Select}
+                        options={dataRateOverrideOptions}
+                        filterOption={dataRateFilterOption}
+                        className="d-flex direction-column flex-grow"
+                      />
+                      <Form.Field
+                        title={sharedMessages.minNbTrans}
+                        name={`mac_settings.adr.dynamic.overrides.${index}.min_nb_trans`}
+                        component={Input}
+                        className="d-flex direction-column flex-grow"
+                        type="number"
+                        min={1}
+                        max={3}
+                      />
+                      <Form.Field
+                        title={sharedMessages.maxNbTrans}
+                        name={`mac_settings.adr.dynamic.overrides.${index}.max_nb_trans`}
+                        component={Input}
+                        className="d-flex direction-column flex-grow"
+                        type="number"
+                        min={1}
+                        max={3}
+                      />
+                      <Button
+                        type="button"
+                        onClick={handleRemoveButtonClick}
+                        icon={IconTrash}
+                        message={sharedMessages.remove}
+                        value={index}
+                        secondary
+                        danger
+                      />
+                    </Form.FieldContainer>
+                  ))}
+                <Button
+                  type="button"
+                  message={sharedMessages.addSpecificOverride}
+                  onClick={addOverride}
+                  icon={IconPlus}
+                  secondary
+                />
+              </Form.InfoField>
+            </>
+          )}
+        </>
+      )}
+      {isStaticAdr && (
+        <>
+          <Form.Field
+            title={sharedMessages.adrDataRate}
+            name="mac_settings.adr.static.data_rate_index"
+            component={Input}
+            type="number"
+            inputWidth="xs"
+          />
+          <Form.Field
+            title={sharedMessages.adrTransPower}
+            name="mac_settings.adr.static.tx_power_index"
+            component={Input}
+            type="number"
+            inputWidth="xs"
+            max={15}
+          />
+          <Form.Field
+            title={sharedMessages.adrUplinks}
+            name="mac_settings.adr.static.nb_trans"
+            component={Input}
+            type="number"
+            inputWidth="xs"
+            min={1}
+            max={15}
+          />
+        </>
+      )}
+      <Form.Field
+        title={sharedMessages.desiredAdrAckLimit}
+        name="mac_settings.desired_adr_ack_limit_exponent"
+        component={Select}
+        options={adrAckLimitOptions}
+        tooltipId={tooltipIds.ADR_ACK_LIMIT}
+        fieldWidth="half"
+      />
+      <Form.Field
+        title={sharedMessages.desiredAdrAckDelay}
+        name="mac_settings.desired_adr_ack_delay_exponent"
+        component={Select}
+        options={adrAckDelayOptions}
+        tooltipId={tooltipIds.ADR_ACK_DELAY}
+        fieldWidth="half"
+      />
+    </>
+  )
+}
+
+const MACSettingsProfileForm = () => {
+  const dispatch = useDispatch()
+  const { appId } = useParams()
+  const [error, setError] = useState('')
+
+  const handleSubmit = useCallback(
+    async values => {
+      const castedValues = validationSchema.cast(values)
+      try {
+        await dispatch(attachPromise(createMacSettingsProfile(appId, castedValues)))
+        toast({
+          message: 'MAC settings profile created',
+          type: toast.types.SUCCESS,
+        })
+      } catch (error) {
+        setError(error)
+      }
+    },
+    [appId, dispatch],
+  )
+
+  return (
+    <Form
+      validationSchema={validationSchema}
+      initialValues={initialValues}
+      onSubmit={handleSubmit}
+      error={error}
+    >
+      <MACSettingsProfileInnerForm />
+      <SubmitBar>
+        <Form.Submit component={SubmitButton} message={sharedMessages.saveChanges} />
+      </SubmitBar>
+    </Form>
+  )
+}
+
+export default MACSettingsProfileForm
diff --git a/pkg/webui/console/containers/mac-settings-profiles-table/index.js b/pkg/webui/console/containers/mac-settings-profiles-table/index.js
new file mode 100644
index 0000000000..17e73e06f6
--- /dev/null
+++ b/pkg/webui/console/containers/mac-settings-profiles-table/index.js
@@ -0,0 +1,116 @@
+// Copyright © 2025 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import React from 'react'
+import { defineMessages } from 'react-intl'
+
+import ButtonGroup from '@ttn-lw/components/button/group'
+import Button from '@ttn-lw/components/button'
+import PageTitle from '@ttn-lw/components/page-title'
+import { IconPencil } from '@ttn-lw/components/icon'
+import DeleteModalButton from '@ttn-lw/components/delete-modal-button'
+
+import FetchTable from '@ttn-lw/containers/fetch-table'
+
+import DateTime from '@ttn-lw/lib/components/date-time'
+import Message from '@ttn-lw/lib/components/message'
+
+import PropTypes from '@ttn-lw/lib/prop-types'
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+const m = defineMessages({
+  information:
+    'MAC settings profiles are used to set MAC settings of end devices more conveniently.',
+  deleteSuccess: 'MAC settings profile deleted',
+  deleteFail: 'There was an error and the MAC settings profile could not be deleted',
+  deleteModalMessage: 'The profile will not be applicable to end devices anymore.',
+})
+
+const MacSettingsProfilesTable = props => {
+  const { baseDataSelector, getItemsAction } = props
+
+  const headers = [
+    {
+      name: 'ids.profile_id',
+      displayName: sharedMessages.nameAndId,
+      getValue: row => ({
+        id: row.ids.profile_id,
+        name: row.name,
+      }),
+      render: ({ name, id }) =>
+        Boolean(name) ? (
+          <>
+            <span className="mt-0 mb-cs-xxs p-0 fw-bold d-block">{name}</span>
+            <span className="c-text-neutral-light d-block">{id}</span>
+          </>
+        ) : (
+          <span className="mt-0 p-0 fw-bold d-block">{id}</span>
+        ),
+      sortable: true,
+      sortKey: 'ids.profile_id',
+    },
+    {
+      name: 'created_at',
+      displayName: sharedMessages.createdAt,
+      width: 10,
+      render: date => <DateTime.Relative value={date} />,
+    },
+    {
+      name: 'actions',
+      displayName: sharedMessages.actions,
+      width: 50,
+      render: details => (
+        <ButtonGroup align="end">
+          <Button
+            message={sharedMessages.edit}
+            icon={IconPencil}
+            onClick={details.edit}
+            secondary
+            small
+          />
+          <DeleteModalButton
+            message={sharedMessages.delete}
+            entityId={details.id}
+            entityName={details.name}
+            onApprove={details.delete}
+            defaultMessage={m.deleteModalMessage}
+            small
+          />
+        </ButtonGroup>
+      ),
+    },
+  ]
+
+  return (
+    <>
+      <PageTitle title={sharedMessages.macSettingsProfiles} className="mb-0" />
+      <Message content={m.information} />
+      <FetchTable
+        entity="mac_settings_profiles"
+        defaultOrder="-ids.profile_id"
+        headers={headers}
+        addMessage={'Create MAC settings profile'}
+        baseDataSelector={baseDataSelector}
+        getItemsAction={getItemsAction}
+      />
+    </>
+  )
+}
+
+MacSettingsProfilesTable.propTypes = {
+  baseDataSelector: PropTypes.func.isRequired,
+  getItemsAction: PropTypes.func.isRequired,
+}
+
+export default MacSettingsProfilesTable
diff --git a/pkg/webui/console/containers/sidebar/navigation/app-side-navigation.js b/pkg/webui/console/containers/sidebar/navigation/app-side-navigation.js
index d7ba3b66aa..ed82c5a98c 100644
--- a/pkg/webui/console/containers/sidebar/navigation/app-side-navigation.js
+++ b/pkg/webui/console/containers/sidebar/navigation/app-side-navigation.js
@@ -31,6 +31,7 @@ import {
   IconPayloadFormat,
   IconUplink,
   IconLayoutDashboard,
+  IconSquare,
 } from '@ttn-lw/components/icon'
 import SideNavigation from '@ttn-lw/components/sidebar/side-menu'
 import DedicatedEntity from '@ttn-lw/components/sidebar/dedicated-entity'
@@ -148,6 +149,11 @@ const AppSideNavigation = () => {
             icon={IconCollaborators}
           />
         )}
+        <SideNavigation.Item
+          title={sharedMessages.macSettingsProfiles}
+          path={`/applications/${appId}/mac-settings-profiles`}
+          icon={IconSquare}
+        />
         {mayViewOrEditApplicationApiKeys.check(rights) && (
           <SideNavigation.Item
             title={sharedMessages.apiKeys}
diff --git a/pkg/webui/console/store/actions/mac-settings-profiles.js b/pkg/webui/console/store/actions/mac-settings-profiles.js
new file mode 100644
index 0000000000..3aabc98ed5
--- /dev/null
+++ b/pkg/webui/console/store/actions/mac-settings-profiles.js
@@ -0,0 +1,47 @@
+// Copyright © 2025 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import createRequestActions from '@ttn-lw/lib/store/actions/create-request-actions'
+import { createPaginationByParentRequestActions } from '@ttn-lw/lib/store/actions/pagination'
+
+export const GET_MAC_SETTINGS_PROFILES_LIST_BASE = 'GET_MAC_SETTINGS_PROFILES_LIST'
+export const [
+  {
+    request: GET_MAC_SETTINGS_PROFILES_LIST,
+    success: GET_MAC_SETTINGS_PROFILES_LIST_SUCCESS,
+    failure: GET_MAC_SETTINGS_PROFILES_LIST_FAILURE,
+  },
+  {
+    request: getMacSettingsProfilesList,
+    success: getMacSettingsProfilesListSuccess,
+    failure: getMacSettingsProfilesListFailure,
+  },
+] = createPaginationByParentRequestActions('MAC_SETTINGS_PROFILES')
+
+export const CREATE_MAC_SETTINGS_PROFILE_BASE = 'CREATE_MAC_SETTINGS_PROFILE'
+export const [
+  {
+    request: CREATE_MAC_SETTINGS_PROFILE,
+    success: CREATE_MAC_SETTINGS_PROFILE_SUCCESS,
+    failure: CREATE_MAC_SETTINGS_PROFILE_FAILURE,
+  },
+  {
+    request: createMacSettingsProfile,
+    success: createMacSettingsProfileSuccess,
+    failure: createMacSettingsProfileFailure,
+  },
+] = createRequestActions(CREATE_MAC_SETTINGS_PROFILE_BASE, (appId, macSettingsProfile) => ({
+  appId,
+  macSettingsProfile,
+}))
diff --git a/pkg/webui/console/store/middleware/logics/index.js b/pkg/webui/console/store/middleware/logics/index.js
index 025e6d7b4d..85660c884c 100644
--- a/pkg/webui/console/store/middleware/logics/index.js
+++ b/pkg/webui/console/store/middleware/logics/index.js
@@ -45,6 +45,7 @@ import sessions from './sessions'
 import authorizations from './authorizations'
 import clients from './clients'
 import connectionProfiles from './connection-profiles'
+import macSettingsProfiles from './mac-settings-profiles'
 
 export default [
   ...status,
@@ -79,4 +80,5 @@ export default [
   ...authorizations,
   ...clients,
   ...connectionProfiles,
+  ...macSettingsProfiles,
 ]
diff --git a/pkg/webui/console/store/middleware/logics/mac-settings-profiles.js b/pkg/webui/console/store/middleware/logics/mac-settings-profiles.js
new file mode 100644
index 0000000000..42526e5968
--- /dev/null
+++ b/pkg/webui/console/store/middleware/logics/mac-settings-profiles.js
@@ -0,0 +1,48 @@
+// Copyright © 2025 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import tts from '@console/api/tts'
+
+import createRequestLogic from '@ttn-lw/lib/store/logics/create-request-logic'
+
+import {
+  CREATE_MAC_SETTINGS_PROFILE,
+  GET_MAC_SETTINGS_PROFILES_LIST,
+} from '@console/store/actions/mac-settings-profiles'
+
+const getMacSettingsProfiles = createRequestLogic({
+  type: GET_MAC_SETTINGS_PROFILES_LIST,
+  process: async ({ action }) => {
+    const {
+      parentId,
+      params: { page, limit, order },
+    } = action.payload
+
+    const data = await tts.NsMACSettingsProfiles.getAll(parentId, { page, limit, order })
+
+    return { entities: data.mac_settings_profiles, totalCount: data.totalCount }
+  },
+})
+
+const createMacSettingsProfile = createRequestLogic({
+  type: CREATE_MAC_SETTINGS_PROFILE,
+  process: async ({ action }) => {
+    const { appId, macSettingsProfile } = action.payload
+    const profile = await tts.NsMACSettingsProfiles.create(appId, macSettingsProfile)
+
+    return profile
+  },
+})
+
+export default [getMacSettingsProfiles, createMacSettingsProfile]
diff --git a/pkg/webui/console/store/reducers/index.js b/pkg/webui/console/store/reducers/index.js
index b8283fbe08..6fd8106832 100644
--- a/pkg/webui/console/store/reducers/index.js
+++ b/pkg/webui/console/store/reducers/index.js
@@ -33,6 +33,7 @@ import {
   getCollaboratorId,
   getPacketBrokerNetworkId,
   getClientId,
+  getMacSettingsProfilesId,
 } from '@ttn-lw/lib/selectors/id'
 import { createNamedPaginationReducer } from '@ttn-lw/lib/store/reducers/pagination'
 import fetching from '@ttn-lw/lib/store/reducers/ui/fetching'
@@ -81,6 +82,7 @@ import sessions from './sessions'
 import authorizations from './authorizations'
 import clients from './clients'
 import connectionProfiles from './connection-profiles'
+import macSettingsProfiles from './mac-settings-profiles'
 
 export default combineReducers({
   user,
@@ -135,6 +137,10 @@ export default combineReducers({
     clients: createNamedPaginationReducer('CLIENTS', getClientId),
     pubsubs: createNamedPaginationReducer('PUBSUB', getApplicationId),
     webhooks: createNamedPaginationReducer('WEBHOOKS', getApplicationId),
+    macSettingsProfiles: createNamedPaginationReducer(
+      'MAC_SETTINGS_PROFILES',
+      getMacSettingsProfilesId,
+    ),
   }),
   js,
   gatewayStatus,
@@ -153,4 +159,5 @@ export default combineReducers({
   authorizations,
   clients,
   connectionProfiles,
+  macSettingsProfiles,
 })
diff --git a/pkg/webui/console/store/reducers/mac-settings-profiles.js b/pkg/webui/console/store/reducers/mac-settings-profiles.js
new file mode 100644
index 0000000000..8beb0bb0d6
--- /dev/null
+++ b/pkg/webui/console/store/reducers/mac-settings-profiles.js
@@ -0,0 +1,51 @@
+// Copyright © 2025 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { GET_MAC_SETTINGS_PROFILES_LIST_SUCCESS } from '@console/store/actions/mac-settings-profiles'
+
+const defaultState = {
+  entities: {},
+  totalCount: null,
+  selectedMacProfile: null,
+}
+
+const macSettingsProfile = (state = {}, macSettingsProfile) => ({
+  ...state,
+  ...macSettingsProfile,
+})
+
+const macSettingsProfiles = (state = defaultState, { type, payload }) => {
+  switch (type) {
+    case GET_MAC_SETTINGS_PROFILES_LIST_SUCCESS:
+      const profiles = payload.entities.reduce(
+        (acc, c) => {
+          const id = c.ids.profile_id
+
+          acc[id] = macSettingsProfile(acc[id], c)
+          return acc
+        },
+        { ...state.entities },
+      )
+
+      return {
+        ...state,
+        entities: profiles,
+        totalCount: payload.totalCount,
+      }
+    default:
+      return state
+  }
+}
+
+export default macSettingsProfiles
diff --git a/pkg/webui/console/store/selectors/mac-settings-profiles.js b/pkg/webui/console/store/selectors/mac-settings-profiles.js
new file mode 100644
index 0000000000..6e34599bb9
--- /dev/null
+++ b/pkg/webui/console/store/selectors/mac-settings-profiles.js
@@ -0,0 +1,30 @@
+// Copyright © 2025 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { createSelector } from 'reselect'
+
+import { createPaginationIdsSelectorByEntity } from '@ttn-lw/lib/store/selectors/pagination'
+
+const selectMacSettingsProfilesStore = state => state.macSettingsProfiles
+
+export const selectMacSettingsProfilesEntitiesStore = state =>
+  selectMacSettingsProfilesStore(state)?.entities
+const selectMacSettingsProfilesIds = createPaginationIdsSelectorByEntity('mac_settings_profiles')
+
+export const selectMacSettingsProfiles = createSelector(
+  [selectMacSettingsProfilesIds, selectMacSettingsProfilesEntitiesStore],
+  (ids, entities) => ids.map(id => entities[id]),
+)
+export const selectMacSettingsProfilesTotalCount = state =>
+  selectMacSettingsProfilesStore(state).totalCount
diff --git a/pkg/webui/console/views/application-mac-settings-profile-add/index.js b/pkg/webui/console/views/application-mac-settings-profile-add/index.js
new file mode 100644
index 0000000000..4078d00ba2
--- /dev/null
+++ b/pkg/webui/console/views/application-mac-settings-profile-add/index.js
@@ -0,0 +1,55 @@
+// Copyright © 2025 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import React from 'react'
+import { useParams } from 'react-router-dom'
+
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+import PageTitle from '@ttn-lw/components/page-title'
+
+import RequireRequest from '@ttn-lw/lib/components/require-request'
+
+import MACSettingsProfileForm from '@console/containers/mac-settings-profile-form'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import { selectNsConfig } from '@ttn-lw/lib/selectors/env'
+
+import { getNsFrequencyPlans } from '@console/store/actions/configuration'
+
+const nsEnabled = selectNsConfig().enabled
+
+const ApplicationMacSettingsProfilesAdd = () => {
+  const { appId } = useParams()
+  useBreadcrumbs(
+    'apps.single.mac-settings-profiles.add',
+    <Breadcrumb
+      path={`/applications/${appId}/mac-settings-profiles/add`}
+      content={sharedMessages.add}
+    />,
+  )
+
+  return (
+    <RequireRequest requestAction={nsEnabled ? getNsFrequencyPlans() : undefined}>
+      <div className="container container--lg grid">
+        <PageTitle title={'Create a new MAC setting profile'} className="mb-0" />
+        <div className="item-12">
+          <MACSettingsProfileForm />
+        </div>
+      </div>
+    </RequireRequest>
+  )
+}
+
+export default ApplicationMacSettingsProfilesAdd
diff --git a/pkg/webui/console/views/application-mac-settings-profiles-list/index.js b/pkg/webui/console/views/application-mac-settings-profiles-list/index.js
new file mode 100644
index 0000000000..bf3fe36286
--- /dev/null
+++ b/pkg/webui/console/views/application-mac-settings-profiles-list/index.js
@@ -0,0 +1,64 @@
+// Copyright © 2025 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import React, { useCallback } from 'react'
+import { useParams } from 'react-router-dom'
+import { createSelector } from 'reselect'
+
+import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
+
+import MacSettingsProfilesTable from '@console/containers/mac-settings-profiles-table'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import { getMacSettingsProfilesList } from '@console/store/actions/mac-settings-profiles'
+
+import {
+  selectMacSettingsProfiles,
+  selectMacSettingsProfilesTotalCount,
+} from '@console/store/selectors/mac-settings-profiles'
+
+const ApplicationMacSettingsProfilesList = () => {
+  const { appId } = useParams()
+
+  const getMacSettingsProfiles = useCallback(
+    filters => getMacSettingsProfilesList(undefined, appId, filters),
+    [appId],
+  )
+
+  const baseDataSelectors = createSelector(
+    [selectMacSettingsProfiles, selectMacSettingsProfilesTotalCount],
+    (keys, totalCount) => ({
+      keys,
+      totalCount,
+    }),
+  )
+
+  const baseDataSelector = useCallback(
+    state => baseDataSelectors(state, appId),
+    [appId, baseDataSelectors],
+  )
+
+  return (
+    <div className="container container--xl">
+      <IntlHelmet title={sharedMessages.macSettingsProfiles} />
+      <MacSettingsProfilesTable
+        baseDataSelector={baseDataSelector}
+        getItemsAction={getMacSettingsProfiles}
+      />
+    </div>
+  )
+}
+
+export default ApplicationMacSettingsProfilesList
diff --git a/pkg/webui/console/views/application-mac-settings-profiles/index.js b/pkg/webui/console/views/application-mac-settings-profiles/index.js
new file mode 100644
index 0000000000..35a7b8962e
--- /dev/null
+++ b/pkg/webui/console/views/application-mac-settings-profiles/index.js
@@ -0,0 +1,62 @@
+// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import React from 'react'
+import { Routes, Route, useParams } from 'react-router-dom'
+
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+
+import ErrorView from '@ttn-lw/lib/components/error-view'
+import ValidateRouteParam from '@ttn-lw/lib/components/validate-route-param'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+
+import SubViewError from '@console/views/sub-view-error'
+import ApplicationMacSettingsProfilesList from '@console/views/application-mac-settings-profiles-list'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import ApplicationMacSettingsProfilesAdd from '../application-mac-settings-profile-add'
+
+const ApplicationMacSettingsProfiles = () => {
+  const { appId } = useParams()
+
+  useBreadcrumbs(
+    'apps.single.mac-settings-profiles',
+    <Breadcrumb
+      path={`/applications/${appId}/mac-settings-profiles`}
+      content={sharedMessages.macSettingsProfiles}
+    />,
+  )
+
+  return (
+    <ErrorView errorRender={SubViewError}>
+      <Routes>
+        <Route index Component={ApplicationMacSettingsProfilesList} />
+        <Route path="/add" Component={ApplicationMacSettingsProfilesAdd} />
+        {/* <Route
+          path="/:macSettingsProfileId"
+          element={
+            <ValidateRouteParam
+              check={{ macSettingsProfileId: macSettingsProfileIdPathRegexp }}
+              Component={ApplicationMacSettingsProfilesEdit}
+            />
+          }
+        /> */}
+        <Route path="*" element={<GenericNotFound />} />
+      </Routes>
+    </ErrorView>
+  )
+}
+
+export default ApplicationMacSettingsProfiles
diff --git a/pkg/webui/console/views/application/index.js b/pkg/webui/console/views/application/index.js
index 094cb68041..97e9a1f727 100644
--- a/pkg/webui/console/views/application/index.js
+++ b/pkg/webui/console/views/application/index.js
@@ -41,6 +41,7 @@ import ApplicationIntegrationsWebhooks from '@console/views/application-integrat
 import ApplicationIntegrationsPubsubs from '@console/views/application-integrations-pubsubs'
 import ApplicationIntegrationsMqtt from '@console/views/application-integrations-mqtt'
 import ApplicationIntegrationsLoRaCloud from '@console/views/application-integrations-lora-cloud'
+import ApplicationMacSettingsProfiles from '@console/views/application-mac-settings-profiles'
 import Devices from '@console/views/devices'
 
 import { selectApplicationSiteName } from '@ttn-lw/lib/selectors/env'
@@ -129,6 +130,7 @@ const ApplicationInner = () => {
         <Route path="api-keys/*" Component={ApplicationApiKeys} />
         <Route path="devices/*" Component={Devices} />
         <Route path="collaborators/*" Component={ApplicationCollaborators} />
+        <Route path="mac-settings-profiles/*" Component={ApplicationMacSettingsProfiles} />
         <Route path="data" Component={ApplicationData} />
         <Route path="payload-formatters/*" Component={ApplicationPayloadFormatters} />
         <Route path="integrations/mqtt" Component={ApplicationIntegrationsMqtt} />
diff --git a/pkg/webui/lib/selectors/id.js b/pkg/webui/lib/selectors/id.js
index 7286a63e4d..624f3347ec 100644
--- a/pkg/webui/lib/selectors/id.js
+++ b/pkg/webui/lib/selectors/id.js
@@ -128,3 +128,6 @@ export const getPacketBrokerHomeNewtorkId = (policy = {}) =>
   combinePacketBrokerIds(policy.home_network_id)
 
 export const getClientId = (client = {}) => getByPath(client, 'ids.client_id')
+
+export const getMacSettingsProfilesId = (macSettingsProfile = {}) =>
+  getByPath(macSettingsProfile, 'ids.profile_id')
diff --git a/pkg/webui/lib/shared-messages.js b/pkg/webui/lib/shared-messages.js
index d360fb0761..e892a5eb73 100644
--- a/pkg/webui/lib/shared-messages.js
+++ b/pkg/webui/lib/shared-messages.js
@@ -195,6 +195,7 @@ export default defineMessages({
   deleteModalTitle: 'Are you sure you want to delete <pre>{entityName}</pre>?',
   delete: 'Delete',
   deleted: 'Deleted (Admin)',
+  deleteProfile: 'Delete profile',
   description: 'Description',
   details: 'Details',
   devAddr: 'Device address',
@@ -388,6 +389,7 @@ export default defineMessages({
   lorawanOptions: 'LoRaWAN options',
   lorawanPhyVersionDescription: 'The LoRaWAN PHY version of the end device',
   macData: 'MAC data',
+  macSettingsProfiles: 'MAC settings profiles',
   macSettingsError:
     'There was an error and the default MAC settings for the <code>{freqPlan}</code> frequency plan could not be loaded',
   macVersion: 'LoRaWAN version',
@@ -700,4 +702,46 @@ export default defineMessages({
   webhookActive: 'Webhook active',
   webhookPaused: 'Webhook paused',
   wifiProfiles: 'WiFi profiles',
+
+  delayValue: '{count, plural, one {{count} second} other {{count} seconds}}',
+  factoryPresetFreqDescription: 'List of factory-preset frequencies. Note: order is respected.',
+  advancedMacSettings: 'Advanced MAC settings',
+  desiredPingSlotFrequencyTitle: 'Desired ping slot frequency',
+  pingSlotPeriodicityDescription: 'Periodicity of the class B ping slot',
+  pingSlotDataRateTitle: 'Ping slot data rate index',
+  desiredPingSlotDataRateTitle: 'Desired ping slot data rate',
+  resetFCntWarning: 'Resetting is insecure and makes your device susceptible for replay attacks',
+  desiredRx1DataRateOffsetTitle: 'Desired Rx1 data rate offset',
+  desiredRx1DelayTitle: 'Desired Rx1 delay',
+  rx2DataRateIndexTitle: 'Rx2 data rate index',
+  desiredRx2DataRateIndexTitle: 'Desired Rx2 data rate index',
+  desiredRx2FrequencyTitle: 'Desired Rx2 frequency',
+  updateSuccess: 'The MAC settings updated',
+  desiredBeaconFrequency: 'Desired beacon frequency',
+  maxDutyCycle: 'Maximum duty cycle',
+  desiredMaxDutyCycle: 'Desired maximum duty cycle',
+  adrMargin: 'ADR margin',
+  adrUplinks: 'ADR number of transmissions',
+  adrAdaptiveDataRate: 'Adaptive data rate (ADR)',
+  adrDataRate: 'ADR data rate index',
+  adrTransPower: 'ADR transmission power index',
+  adrDynamic: 'Dynamic mode',
+  adrStatic: 'Static mode',
+  desiredAdrAckLimit: 'Desired ADR ack limit',
+  desiredAdrAckDelay: 'Desired ADR ack delay',
+  adrAckValue: '{count, plural, one {every message} other {every {count} messages}}',
+  statusCountPeriodicity: 'Status count periodicity',
+  statusTimePeriodicity: 'Status time periodicity',
+  dataRate: 'Data Rate {n}',
+  dataRatePlaceholder: 'Data Rate',
+  minNbTrans: 'Min. NbTrans',
+  maxNbTrans: 'Max. NbTrans',
+  useDefaultNbTrans: 'Use default settings for number of retransmissions',
+  adrNbTrans: 'ADR number of retransmissions (NbTrans)',
+  overrideNbTrans: 'Override server defaults for NbTrans (all data rates)',
+  defaultForAllRates: '(Default for all data rates)',
+  defaultNbTransMessage:
+    'Overriding the default is not required for using data rate overrides (below)',
+  specificOverrides: 'Data rate specific overrides',
+  addSpecificOverride: 'Add data rate specific override',
 })
diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
index 5c2568c0f1..60c63453e9 100644
--- a/pkg/webui/locales/en.json
+++ b/pkg/webui/locales/en.json
@@ -177,46 +177,6 @@
   "console.components.location-form.index.noLocationSetInfo": "There is currently no manual location information set",
   "console.components.location-form.index.updateSuccess": "Location updated",
   "console.components.lorawan-version-input.index.phyVersionError": "Failed to fetch regional parameters versions",
-  "console.components.mac-settings-section.index.delayValue": "{count, plural, one {{count} second} other {{count} seconds}}",
-  "console.components.mac-settings-section.index.factoryPresetFreqDescription": "List of factory-preset frequencies. Note: order is respected.",
-  "console.components.mac-settings-section.index.advancedMacSettings": "Advanced MAC settings",
-  "console.components.mac-settings-section.index.desiredPingSlotFrequencyTitle": "Desired ping slot frequency",
-  "console.components.mac-settings-section.index.pingSlotPeriodicityDescription": "Periodicity of the class B ping slot",
-  "console.components.mac-settings-section.index.pingSlotDataRateTitle": "Ping slot data rate index",
-  "console.components.mac-settings-section.index.desiredPingSlotDataRateTitle": "Desired ping slot data rate",
-  "console.components.mac-settings-section.index.resetWarning": "Resetting is insecure and makes your device susceptible for replay attacks",
-  "console.components.mac-settings-section.index.desiredRx1DataRateOffsetTitle": "Desired Rx1 data rate offset",
-  "console.components.mac-settings-section.index.desiredRx1DelayTitle": "Desired Rx1 delay",
-  "console.components.mac-settings-section.index.rx2DataRateIndexTitle": "Rx2 data rate index",
-  "console.components.mac-settings-section.index.desiredRx2DataRateIndexTitle": "Desired Rx2 data rate index",
-  "console.components.mac-settings-section.index.desiredRx2FrequencyTitle": "Desired Rx2 frequency",
-  "console.components.mac-settings-section.index.updateSuccess": "The MAC settings updated",
-  "console.components.mac-settings-section.index.desiredBeaconFrequency": "Desired beacon frequency",
-  "console.components.mac-settings-section.index.maxDutyCycle": "Maximum duty cycle",
-  "console.components.mac-settings-section.index.desiredMaxDutyCycle": "Desired maximum duty cycle",
-  "console.components.mac-settings-section.index.adrMargin": "ADR margin",
-  "console.components.mac-settings-section.index.adrUplinks": "ADR number of transmissions",
-  "console.components.mac-settings-section.index.adrAdaptiveDataRate": "Adaptive data rate (ADR)",
-  "console.components.mac-settings-section.index.adrDataRate": "ADR data rate index",
-  "console.components.mac-settings-section.index.adrTransPower": "ADR transmission power index",
-  "console.components.mac-settings-section.index.adrDynamic": "Dynamic mode",
-  "console.components.mac-settings-section.index.adrStatic": "Static mode",
-  "console.components.mac-settings-section.index.desiredAdrAckLimit": "Desired ADR ack limit",
-  "console.components.mac-settings-section.index.desiredAdrAckDelay": "Desired ADR ack delay",
-  "console.components.mac-settings-section.index.adrAckValue": "{count, plural, one {every message} other {every {count} messages}}",
-  "console.components.mac-settings-section.index.statusCountPeriodicity": "Status count periodicity",
-  "console.components.mac-settings-section.index.statusTimePeriodicity": "Status time periodicity",
-  "console.components.mac-settings-section.index.dataRate": "Data Rate {n}",
-  "console.components.mac-settings-section.index.dataRatePlaceholder": "Data Rate",
-  "console.components.mac-settings-section.index.minNbTrans": "Min. NbTrans",
-  "console.components.mac-settings-section.index.maxNbTrans": "Max. NbTrans",
-  "console.components.mac-settings-section.index.useDefaultNbTrans": "Use default settings for number of retransmissions",
-  "console.components.mac-settings-section.index.adrNbTrans": "ADR number of retransmissions (NbTrans)",
-  "console.components.mac-settings-section.index.overrideNbTrans": "Override server defaults for NbTrans (all data rates)",
-  "console.components.mac-settings-section.index.defaultForAllRates": "(Default for all data rates)",
-  "console.components.mac-settings-section.index.defaultNbTransMessage": "Overriding the default is not required for using data rate overrides (below)",
-  "console.components.mac-settings-section.index.specificOverrides": "Data rate specific overrides",
-  "console.components.mac-settings-section.index.addSpecificOverride": "Add data rate specific override",
   "console.components.notifications.templates.api-key-changed.title": "API key of {entityType} has been changed",
   "console.components.notifications.templates.api-key-changed.body": "An API key of your {entityType} <code>{id}</code> on your network has been changed.",
   "console.components.notifications.templates.api-key-changed.preview": "An API key of your {entityType} \"{id}\" on your network has been changed. API Key ID: {apiKeyId}",
@@ -645,7 +605,6 @@
   "console.containers.gateway-managed-gateway.wifi-profiles.form.updateFailure": "There was an error updating this WiFi profile",
   "console.containers.gateway-managed-gateway.wifi-profiles.overview.information": "Connection profiles are setup to allow for multiple gateways to connect via the same settings. You can use this view to manage all your profiles or create new ones, after which you can assign them to your gateway.",
   "console.containers.gateway-managed-gateway.wifi-profiles.overview.accessPoint": "Access point",
-  "console.containers.gateway-managed-gateway.wifi-profiles.overview.deleteProfile": "Delete profile",
   "console.containers.gateway-managed-gateway.wifi-profiles.overview.deleteSuccess": "WiFi profile deleted",
   "console.containers.gateway-managed-gateway.wifi-profiles.overview.deleteFail": "There was an error and the WiFi profile could not be deleted",
   "console.containers.gateway-managed-gateway.wifi-profiles.overview.deleteModalMessage": "The profile will not be applicable to gateways anymore and gateways using this profile might lose connectivity. Please make sure to update the gateway settings before deleting this profile.",
@@ -738,6 +697,10 @@
   "console.containers.lora-cloud-ms-form.index.modemEncoding": "LoRa Edge Reference Tracker (Modem-E) encoding",
   "console.containers.lora-cloud-ms-form.index.deleteWarning": "Are you sure you want to delete the LoRa Cloud Modem and Geolocation Services token? This action cannot be undone.",
   "console.containers.lora-cloud-ms-form.index.fPortSetValidationFormat": "The FPort must be a number between 1 and 223, or a comma-separated list of numbers between 1 and 223",
+  "console.containers.mac-settings-profiles-table.index.information": "MAC settings profiles are used to set MAC settings of end devices more conveniently.",
+  "console.containers.mac-settings-profiles-table.index.deleteSuccess": "MAC settings profile deleted",
+  "console.containers.mac-settings-profiles-table.index.deleteFail": "There was an error and the MAC settings profile could not be deleted",
+  "console.containers.mac-settings-profiles-table.index.deleteModalMessage": "The profile will not be applicable to end devices anymore.",
   "console.containers.move-away-modal.move-away-modal.modalTitle": "Confirm navigation",
   "console.containers.move-away-modal.move-away-modal.modalMessage": "Are you sure you want to leave this page? Your current changes have not been saved yet.",
   "console.containers.network-information-container.index.openSourceInfo": "You are currently using The Things Stack Open Source. More features can be unlocked by using The Things Stack Cloud.",
@@ -1386,6 +1349,7 @@
   "lib.shared-messages.deleteModalTitle": "Are you sure you want to delete <pre>{entityName}</pre>?",
   "lib.shared-messages.delete": "Delete",
   "lib.shared-messages.deleted": "Deleted (Admin)",
+  "lib.shared-messages.deleteProfile": "Delete profile",
   "lib.shared-messages.description": "Description",
   "lib.shared-messages.details": "Details",
   "lib.shared-messages.devAddr": "Device address",
@@ -1564,6 +1528,7 @@
   "lib.shared-messages.lorawanOptions": "LoRaWAN options",
   "lib.shared-messages.lorawanPhyVersionDescription": "The LoRaWAN PHY version of the end device",
   "lib.shared-messages.macData": "MAC data",
+  "lib.shared-messages.macSettingsProfiles": "MAC settings profiles",
   "lib.shared-messages.macSettingsError": "There was an error and the default MAC settings for the <code>{freqPlan}</code> frequency plan could not be loaded",
   "lib.shared-messages.macVersion": "LoRaWAN version",
   "lib.shared-messages.map": "Map",
@@ -1862,5 +1827,45 @@
   "lib.shared-messages.webhookError": "Webhook error",
   "lib.shared-messages.webhookActive": "Webhook active",
   "lib.shared-messages.webhookPaused": "Webhook paused",
-  "lib.shared-messages.wifiProfiles": "WiFi profiles"
+  "lib.shared-messages.wifiProfiles": "WiFi profiles",
+  "lib.shared-messages.delayValue": "{count, plural, one {{count} second} other {{count} seconds}}",
+  "lib.shared-messages.factoryPresetFreqDescription": "List of factory-preset frequencies. Note: order is respected.",
+  "lib.shared-messages.advancedMacSettings": "Advanced MAC settings",
+  "lib.shared-messages.desiredPingSlotFrequencyTitle": "Desired ping slot frequency",
+  "lib.shared-messages.pingSlotPeriodicityDescription": "Periodicity of the class B ping slot",
+  "lib.shared-messages.pingSlotDataRateTitle": "Ping slot data rate index",
+  "lib.shared-messages.desiredPingSlotDataRateTitle": "Desired ping slot data rate",
+  "lib.shared-messages.resetFCntWarning": "Resetting is insecure and makes your device susceptible for replay attacks",
+  "lib.shared-messages.desiredRx1DataRateOffsetTitle": "Desired Rx1 data rate offset",
+  "lib.shared-messages.desiredRx1DelayTitle": "Desired Rx1 delay",
+  "lib.shared-messages.rx2DataRateIndexTitle": "Rx2 data rate index",
+  "lib.shared-messages.desiredRx2DataRateIndexTitle": "Desired Rx2 data rate index",
+  "lib.shared-messages.desiredRx2FrequencyTitle": "Desired Rx2 frequency",
+  "lib.shared-messages.updateSuccess": "The MAC settings updated",
+  "lib.shared-messages.desiredBeaconFrequency": "Desired beacon frequency",
+  "lib.shared-messages.maxDutyCycle": "Maximum duty cycle",
+  "lib.shared-messages.desiredMaxDutyCycle": "Desired maximum duty cycle",
+  "lib.shared-messages.adrMargin": "ADR margin",
+  "lib.shared-messages.adrUplinks": "ADR number of transmissions",
+  "lib.shared-messages.adrAdaptiveDataRate": "Adaptive data rate (ADR)",
+  "lib.shared-messages.adrDataRate": "ADR data rate index",
+  "lib.shared-messages.adrTransPower": "ADR transmission power index",
+  "lib.shared-messages.adrDynamic": "Dynamic mode",
+  "lib.shared-messages.adrStatic": "Static mode",
+  "lib.shared-messages.desiredAdrAckLimit": "Desired ADR ack limit",
+  "lib.shared-messages.desiredAdrAckDelay": "Desired ADR ack delay",
+  "lib.shared-messages.adrAckValue": "{count, plural, one {every message} other {every {count} messages}}",
+  "lib.shared-messages.statusCountPeriodicity": "Status count periodicity",
+  "lib.shared-messages.statusTimePeriodicity": "Status time periodicity",
+  "lib.shared-messages.dataRate": "Data Rate {n}",
+  "lib.shared-messages.dataRatePlaceholder": "Data Rate",
+  "lib.shared-messages.minNbTrans": "Min. NbTrans",
+  "lib.shared-messages.maxNbTrans": "Max. NbTrans",
+  "lib.shared-messages.useDefaultNbTrans": "Use default settings for number of retransmissions",
+  "lib.shared-messages.adrNbTrans": "ADR number of retransmissions (NbTrans)",
+  "lib.shared-messages.overrideNbTrans": "Override server defaults for NbTrans (all data rates)",
+  "lib.shared-messages.defaultForAllRates": "(Default for all data rates)",
+  "lib.shared-messages.defaultNbTransMessage": "Overriding the default is not required for using data rate overrides (below)",
+  "lib.shared-messages.specificOverrides": "Data rate specific overrides",
+  "lib.shared-messages.addSpecificOverride": "Add data rate specific override"
 }
diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index b5c8d46f37..b5625bc478 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -177,46 +177,6 @@
   "console.components.location-form.index.noLocationSetInfo": "",
   "console.components.location-form.index.updateSuccess": "",
   "console.components.lorawan-version-input.index.phyVersionError": "",
-  "console.components.mac-settings-section.index.delayValue": "",
-  "console.components.mac-settings-section.index.factoryPresetFreqDescription": "",
-  "console.components.mac-settings-section.index.advancedMacSettings": "",
-  "console.components.mac-settings-section.index.desiredPingSlotFrequencyTitle": "",
-  "console.components.mac-settings-section.index.pingSlotPeriodicityDescription": "",
-  "console.components.mac-settings-section.index.pingSlotDataRateTitle": "",
-  "console.components.mac-settings-section.index.desiredPingSlotDataRateTitle": "",
-  "console.components.mac-settings-section.index.resetWarning": "",
-  "console.components.mac-settings-section.index.desiredRx1DataRateOffsetTitle": "",
-  "console.components.mac-settings-section.index.desiredRx1DelayTitle": "",
-  "console.components.mac-settings-section.index.rx2DataRateIndexTitle": "",
-  "console.components.mac-settings-section.index.desiredRx2DataRateIndexTitle": "",
-  "console.components.mac-settings-section.index.desiredRx2FrequencyTitle": "",
-  "console.components.mac-settings-section.index.updateSuccess": "",
-  "console.components.mac-settings-section.index.desiredBeaconFrequency": "",
-  "console.components.mac-settings-section.index.maxDutyCycle": "",
-  "console.components.mac-settings-section.index.desiredMaxDutyCycle": "",
-  "console.components.mac-settings-section.index.adrMargin": "",
-  "console.components.mac-settings-section.index.adrUplinks": "",
-  "console.components.mac-settings-section.index.adrAdaptiveDataRate": "",
-  "console.components.mac-settings-section.index.adrDataRate": "",
-  "console.components.mac-settings-section.index.adrTransPower": "",
-  "console.components.mac-settings-section.index.adrDynamic": "",
-  "console.components.mac-settings-section.index.adrStatic": "",
-  "console.components.mac-settings-section.index.desiredAdrAckLimit": "",
-  "console.components.mac-settings-section.index.desiredAdrAckDelay": "",
-  "console.components.mac-settings-section.index.adrAckValue": "",
-  "console.components.mac-settings-section.index.statusCountPeriodicity": "",
-  "console.components.mac-settings-section.index.statusTimePeriodicity": "",
-  "console.components.mac-settings-section.index.dataRate": "",
-  "console.components.mac-settings-section.index.dataRatePlaceholder": "",
-  "console.components.mac-settings-section.index.minNbTrans": "",
-  "console.components.mac-settings-section.index.maxNbTrans": "",
-  "console.components.mac-settings-section.index.useDefaultNbTrans": "",
-  "console.components.mac-settings-section.index.adrNbTrans": "",
-  "console.components.mac-settings-section.index.overrideNbTrans": "",
-  "console.components.mac-settings-section.index.defaultForAllRates": "",
-  "console.components.mac-settings-section.index.defaultNbTransMessage": "",
-  "console.components.mac-settings-section.index.specificOverrides": "",
-  "console.components.mac-settings-section.index.addSpecificOverride": "",
   "console.components.notifications.templates.api-key-changed.title": "",
   "console.components.notifications.templates.api-key-changed.body": "",
   "console.components.notifications.templates.api-key-changed.preview": "",
@@ -645,7 +605,6 @@
   "console.containers.gateway-managed-gateway.wifi-profiles.form.updateFailure": "",
   "console.containers.gateway-managed-gateway.wifi-profiles.overview.information": "",
   "console.containers.gateway-managed-gateway.wifi-profiles.overview.accessPoint": "",
-  "console.containers.gateway-managed-gateway.wifi-profiles.overview.deleteProfile": "",
   "console.containers.gateway-managed-gateway.wifi-profiles.overview.deleteSuccess": "",
   "console.containers.gateway-managed-gateway.wifi-profiles.overview.deleteFail": "",
   "console.containers.gateway-managed-gateway.wifi-profiles.overview.deleteModalMessage": "",
@@ -738,6 +697,10 @@
   "console.containers.lora-cloud-ms-form.index.modemEncoding": "",
   "console.containers.lora-cloud-ms-form.index.deleteWarning": "",
   "console.containers.lora-cloud-ms-form.index.fPortSetValidationFormat": "",
+  "console.containers.mac-settings-profiles-table.index.information": "",
+  "console.containers.mac-settings-profiles-table.index.deleteSuccess": "",
+  "console.containers.mac-settings-profiles-table.index.deleteFail": "",
+  "console.containers.mac-settings-profiles-table.index.deleteModalMessage": "",
   "console.containers.move-away-modal.move-away-modal.modalTitle": "",
   "console.containers.move-away-modal.move-away-modal.modalMessage": "",
   "console.containers.network-information-container.index.openSourceInfo": "",
@@ -1386,6 +1349,7 @@
   "lib.shared-messages.deleteModalTitle": "本当に<pre>{entityName}</pre>を削除しますか？",
   "lib.shared-messages.delete": "",
   "lib.shared-messages.deleted": "削除しました（管理者）",
+  "lib.shared-messages.deleteProfile": "",
   "lib.shared-messages.description": "説明",
   "lib.shared-messages.details": "",
   "lib.shared-messages.devAddr": "デバイスアドレス",
@@ -1564,6 +1528,7 @@
   "lib.shared-messages.lorawanOptions": "LoRaWANオプション",
   "lib.shared-messages.lorawanPhyVersionDescription": "エンドデバイスのLoRaWAN PHYバージョン",
   "lib.shared-messages.macData": "MACデータ",
+  "lib.shared-messages.macSettingsProfiles": "",
   "lib.shared-messages.macSettingsError": "MAC設定エラー",
   "lib.shared-messages.macVersion": "LoRaWANバージョン",
   "lib.shared-messages.map": "",
@@ -1863,6 +1828,46 @@
   "lib.shared-messages.webhookActive": "",
   "lib.shared-messages.webhookPaused": "",
   "lib.shared-messages.wifiProfiles": "",
+  "lib.shared-messages.delayValue": "",
+  "lib.shared-messages.factoryPresetFreqDescription": "",
+  "lib.shared-messages.advancedMacSettings": "",
+  "lib.shared-messages.desiredPingSlotFrequencyTitle": "",
+  "lib.shared-messages.pingSlotPeriodicityDescription": "",
+  "lib.shared-messages.pingSlotDataRateTitle": "",
+  "lib.shared-messages.desiredPingSlotDataRateTitle": "",
+  "lib.shared-messages.resetFCntWarning": "",
+  "lib.shared-messages.desiredRx1DataRateOffsetTitle": "",
+  "lib.shared-messages.desiredRx1DelayTitle": "",
+  "lib.shared-messages.rx2DataRateIndexTitle": "",
+  "lib.shared-messages.desiredRx2DataRateIndexTitle": "",
+  "lib.shared-messages.desiredRx2FrequencyTitle": "",
+  "lib.shared-messages.updateSuccess": "",
+  "lib.shared-messages.desiredBeaconFrequency": "",
+  "lib.shared-messages.maxDutyCycle": "",
+  "lib.shared-messages.desiredMaxDutyCycle": "",
+  "lib.shared-messages.adrMargin": "",
+  "lib.shared-messages.adrUplinks": "",
+  "lib.shared-messages.adrAdaptiveDataRate": "",
+  "lib.shared-messages.adrDataRate": "",
+  "lib.shared-messages.adrTransPower": "",
+  "lib.shared-messages.adrDynamic": "",
+  "lib.shared-messages.adrStatic": "",
+  "lib.shared-messages.desiredAdrAckLimit": "",
+  "lib.shared-messages.desiredAdrAckDelay": "",
+  "lib.shared-messages.adrAckValue": "",
+  "lib.shared-messages.statusCountPeriodicity": "",
+  "lib.shared-messages.statusTimePeriodicity": "",
+  "lib.shared-messages.dataRate": "",
+  "lib.shared-messages.dataRatePlaceholder": "",
+  "lib.shared-messages.minNbTrans": "",
+  "lib.shared-messages.maxNbTrans": "",
+  "lib.shared-messages.useDefaultNbTrans": "",
+  "lib.shared-messages.adrNbTrans": "",
+  "lib.shared-messages.overrideNbTrans": "",
+  "lib.shared-messages.defaultForAllRates": "",
+  "lib.shared-messages.defaultNbTransMessage": "",
+  "lib.shared-messages.specificOverrides": "",
+  "lib.shared-messages.addSpecificOverride": "",
   "enum:CHANNEL_MASKS": "チャネルマスク",
   "enum:CID_ADR_PARAM_SETUP": "ADRパラメータ",
   "enum:CID_BEACON_FREQ": "ビーコン周波数",
diff --git a/sdk/js/src/index.js b/sdk/js/src/index.js
index 072de443a0..db9594f4b5 100644
--- a/sdk/js/src/index.js
+++ b/sdk/js/src/index.js
@@ -37,6 +37,7 @@ import QRCodeGenerator from './service/qr-code-generator'
 import SearchAccounts from './service/search-accounts'
 import Notifications from './service/notifications'
 import ConnectionProfiles from './service/connection-profiles'
+import NsMACSettingsProfiles from './service/network-server-mac-settings-profiles'
 
 class TTS {
   constructor({ authorization, stackConfig, connectionType, defaultUserId, axiosConfig }) {
@@ -56,6 +57,7 @@ class TTS {
     })
     this.Js = new Js(this.api.Js)
     this.Ns = new Ns(this.api.Ns)
+    this.NsMACSettingsProfiles = new NsMACSettingsProfiles(this.api.NsMACSettingsProfileRegistry)
     this.Is = new Is(this.api.Is)
     this.As = new As(this.api)
     this.Organizations = new Organizations(this.api, {
diff --git a/sdk/js/src/service/network-server-mac-settings-profiles.js b/sdk/js/src/service/network-server-mac-settings-profiles.js
new file mode 100644
index 0000000000..6ff738a714
--- /dev/null
+++ b/sdk/js/src/service/network-server-mac-settings-profiles.js
@@ -0,0 +1,50 @@
+// Copyright © 2025 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import autoBind from 'auto-bind'
+
+import Marshaler from '../util/marshaler'
+
+class NsMACSettingsProfiles {
+  constructor(service) {
+    this._api = service
+    autoBind(this)
+  }
+
+  async getAll(applicationId, params) {
+    const result = await this._api.List(
+      {
+        routeParams: { 'application_ids.application_id': applicationId },
+      },
+      {
+        ...params,
+      },
+    )
+    return Marshaler.payloadListResponse('mac_settings_profiles', result)
+  }
+
+  async create(applicationId, macSettingsProfile) {
+    const result = await this._api.Create(
+      {
+        routeParams: { 'mac_settings_profile.ids.application_ids.application_id': applicationId },
+      },
+      {
+        macSettingsProfile,
+      },
+    )
+    return Marshaler.payloadSingleResponse(result)
+  }
+}
+
+export default NsMACSettingsProfiles

From 55b300a62d6f849c2d1a5c1366809e42356f675b Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Thu, 28 Aug 2025 11:50:40 +0200
Subject: [PATCH 02/17] console: Add delete and update mac settings profiles

---
 .../mac-settings-profile-form/index.js        |  6 ++-
 .../mac-settings-profiles-table/index.js      | 52 ++++++++++++++++---
 .../store/actions/mac-settings-profiles.js    | 36 ++++++++++++-
 .../logics/mac-settings-profiles.js           | 33 +++++++++++-
 pkg/webui/console/store/reducers/index.js     |  2 +-
 .../index.js                                  | 11 ++--
 .../network-server-mac-settings-profiles.js   | 39 ++++++++++++++
 7 files changed, 158 insertions(+), 21 deletions(-)

diff --git a/pkg/webui/console/containers/mac-settings-profile-form/index.js b/pkg/webui/console/containers/mac-settings-profile-form/index.js
index 76158eb702..fb9c621306 100644
--- a/pkg/webui/console/containers/mac-settings-profile-form/index.js
+++ b/pkg/webui/console/containers/mac-settings-profile-form/index.js
@@ -15,7 +15,7 @@
 import React, { useCallback, useState } from 'react'
 import { get, set } from 'lodash'
 import { useDispatch } from 'react-redux'
-import { useParams } from 'react-router-dom'
+import { useNavigate, useParams } from 'react-router-dom'
 
 import Form, { useFormContext } from '@ttn-lw/components/form'
 import Radio from '@ttn-lw/components/radio-button'
@@ -600,6 +600,7 @@ const MACSettingsProfileInnerForm = () => {
 const MACSettingsProfileForm = () => {
   const dispatch = useDispatch()
   const { appId } = useParams()
+  const navigate = useNavigate()
   const [error, setError] = useState('')
 
   const handleSubmit = useCallback(
@@ -611,11 +612,12 @@ const MACSettingsProfileForm = () => {
           message: 'MAC settings profile created',
           type: toast.types.SUCCESS,
         })
+        navigate(`/applications/${appId}/mac-settings-profiles`)
       } catch (error) {
         setError(error)
       }
     },
-    [appId, dispatch],
+    [appId, dispatch, navigate],
   )
 
   return (
diff --git a/pkg/webui/console/containers/mac-settings-profiles-table/index.js b/pkg/webui/console/containers/mac-settings-profiles-table/index.js
index 17e73e06f6..01badd33d4 100644
--- a/pkg/webui/console/containers/mac-settings-profiles-table/index.js
+++ b/pkg/webui/console/containers/mac-settings-profiles-table/index.js
@@ -12,22 +12,27 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React from 'react'
+import React, { useCallback } from 'react'
 import { defineMessages } from 'react-intl'
+import { useDispatch } from 'react-redux'
+import { useNavigate, useParams } from 'react-router-dom'
 
 import ButtonGroup from '@ttn-lw/components/button/group'
 import Button from '@ttn-lw/components/button'
 import PageTitle from '@ttn-lw/components/page-title'
 import { IconPencil } from '@ttn-lw/components/icon'
 import DeleteModalButton from '@ttn-lw/components/delete-modal-button'
+import toast from '@ttn-lw/components/toast'
 
 import FetchTable from '@ttn-lw/containers/fetch-table'
 
-import DateTime from '@ttn-lw/lib/components/date-time'
 import Message from '@ttn-lw/lib/components/message'
 
 import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
+import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
+
+import { deleteMacSettingsProfile } from '@console/store/actions/mac-settings-profiles'
 
 const m = defineMessages({
   information:
@@ -38,8 +43,38 @@ const m = defineMessages({
 })
 
 const MacSettingsProfilesTable = props => {
+  const navigate = useNavigate()
+  const dispatch = useDispatch()
+  const { appId } = useParams()
   const { baseDataSelector, getItemsAction } = props
 
+  const handleEdit = useCallback(
+    profileId => {
+      navigate(`/applications/${appId}/mac-settings-profiles/${profileId}`)
+    },
+    [navigate, appId],
+  )
+
+  const handleDelete = useCallback(
+    async id => {
+      try {
+        await dispatch(attachPromise(deleteMacSettingsProfile(appId, id)))
+        toast({
+          title: id,
+          message: m.deleteSuccess,
+          type: toast.types.SUCCESS,
+        })
+      } catch (err) {
+        toast({
+          title: id,
+          message: m.deleteFail,
+          type: toast.types.ERROR,
+        })
+      }
+    },
+    [appId, dispatch],
+  )
+
   const headers = [
     {
       name: 'ids.profile_id',
@@ -60,16 +95,16 @@ const MacSettingsProfilesTable = props => {
       sortable: true,
       sortKey: 'ids.profile_id',
     },
-    {
-      name: 'created_at',
-      displayName: sharedMessages.createdAt,
-      width: 10,
-      render: date => <DateTime.Relative value={date} />,
-    },
     {
       name: 'actions',
       displayName: sharedMessages.actions,
       width: 50,
+      getValue: row => ({
+        id: row.ids.profile_id,
+        name: row.name,
+        edit: handleEdit.bind(null, row.ids.profile_id),
+        delete: handleDelete.bind(null, row.ids.profile_id),
+      }),
       render: details => (
         <ButtonGroup align="end">
           <Button
@@ -103,6 +138,7 @@ const MacSettingsProfilesTable = props => {
         addMessage={'Create MAC settings profile'}
         baseDataSelector={baseDataSelector}
         getItemsAction={getItemsAction}
+        clickable={false}
       />
     </>
   )
diff --git a/pkg/webui/console/store/actions/mac-settings-profiles.js b/pkg/webui/console/store/actions/mac-settings-profiles.js
index 3aabc98ed5..848ab36e76 100644
--- a/pkg/webui/console/store/actions/mac-settings-profiles.js
+++ b/pkg/webui/console/store/actions/mac-settings-profiles.js
@@ -13,7 +13,10 @@
 // limitations under the License.
 
 import createRequestActions from '@ttn-lw/lib/store/actions/create-request-actions'
-import { createPaginationByParentRequestActions } from '@ttn-lw/lib/store/actions/pagination'
+import {
+  createPaginationByIdDeleteActions,
+  createPaginationByParentRequestActions,
+} from '@ttn-lw/lib/store/actions/pagination'
 
 export const GET_MAC_SETTINGS_PROFILES_LIST_BASE = 'GET_MAC_SETTINGS_PROFILES_LIST'
 export const [
@@ -45,3 +48,34 @@ export const [
   appId,
   macSettingsProfile,
 }))
+
+export const UPDATE_MAC_SETTINGS_PROFILE_BASE = 'UPDATE_MAC_SETTINGS_PROFILE'
+export const [
+  {
+    request: UPDATE_MAC_SETTINGS_PROFILE,
+    success: UPDATE_MAC_SETTINGS_PROFILE_SUCCESS,
+    failure: UPDATE_MAC_SETTINGS_PROFILE_FAILURE,
+  },
+  {
+    request: updateMacSettingsProfile,
+    success: updateMacSettingsProfileSuccess,
+    failure: updateMacSettingsProfileFailure,
+  },
+] = createRequestActions(UPDATE_MAC_SETTINGS_PROFILE_BASE, (appId, macSettingsProfile) => ({
+  appId,
+  macSettingsProfile,
+}))
+
+export const DELETE_MAC_SETTINGS_PROFILE_BASE = 'DELETE_MAC_SETTINGS_PROFILE'
+export const [
+  {
+    request: DELETE_MAC_SETTINGS_PROFILE,
+    success: DELETE_MAC_SETTINGS_PROFILE_SUCCESS,
+    failure: DELETE_MAC_SETTINGS_PROFILE_FAILURE,
+  },
+  {
+    request: deleteMacSettingsProfile,
+    success: deleteMacSettingsProfileSuccess,
+    failure: deleteMacSettingsProfileFailure,
+  },
+] = createPaginationByIdDeleteActions('MAC_SETTINGS_PROFILES', (id, targetId) => ({ id, targetId }))
diff --git a/pkg/webui/console/store/middleware/logics/mac-settings-profiles.js b/pkg/webui/console/store/middleware/logics/mac-settings-profiles.js
index 42526e5968..4575c0970d 100644
--- a/pkg/webui/console/store/middleware/logics/mac-settings-profiles.js
+++ b/pkg/webui/console/store/middleware/logics/mac-settings-profiles.js
@@ -18,7 +18,9 @@ import createRequestLogic from '@ttn-lw/lib/store/logics/create-request-logic'
 
 import {
   CREATE_MAC_SETTINGS_PROFILE,
+  DELETE_MAC_SETTINGS_PROFILE,
   GET_MAC_SETTINGS_PROFILES_LIST,
+  UPDATE_MAC_SETTINGS_PROFILE,
 } from '@console/store/actions/mac-settings-profiles'
 
 const getMacSettingsProfiles = createRequestLogic({
@@ -45,4 +47,33 @@ const createMacSettingsProfile = createRequestLogic({
   },
 })
 
-export default [getMacSettingsProfiles, createMacSettingsProfile]
+const updateMacSettingsProfile = createRequestLogic({
+  type: UPDATE_MAC_SETTINGS_PROFILE,
+  process: async ({ action }) => {
+    const { appId, macSettingsProfileId, macSettingsProfile } = action.payload
+    const profile = await tts.NsMACSettingsProfiles.update(
+      appId,
+      macSettingsProfileId,
+      macSettingsProfile,
+    )
+
+    return profile
+  },
+})
+
+const deleteMacSettingsProfile = createRequestLogic({
+  type: DELETE_MAC_SETTINGS_PROFILE,
+  process: async ({ action }) => {
+    const { id, targetId } = action.payload
+    await tts.NsMACSettingsProfiles.delete(id, targetId)
+
+    return { id: targetId }
+  },
+})
+
+export default [
+  getMacSettingsProfiles,
+  createMacSettingsProfile,
+  updateMacSettingsProfile,
+  deleteMacSettingsProfile,
+]
diff --git a/pkg/webui/console/store/reducers/index.js b/pkg/webui/console/store/reducers/index.js
index 6fd8106832..7568529fae 100644
--- a/pkg/webui/console/store/reducers/index.js
+++ b/pkg/webui/console/store/reducers/index.js
@@ -137,7 +137,7 @@ export default combineReducers({
     clients: createNamedPaginationReducer('CLIENTS', getClientId),
     pubsubs: createNamedPaginationReducer('PUBSUB', getApplicationId),
     webhooks: createNamedPaginationReducer('WEBHOOKS', getApplicationId),
-    macSettingsProfiles: createNamedPaginationReducer(
+    mac_settings_profiles: createNamedPaginationReducer(
       'MAC_SETTINGS_PROFILES',
       getMacSettingsProfilesId,
     ),
diff --git a/pkg/webui/console/views/application-mac-settings-profiles-list/index.js b/pkg/webui/console/views/application-mac-settings-profiles-list/index.js
index bf3fe36286..6737035f1b 100644
--- a/pkg/webui/console/views/application-mac-settings-profiles-list/index.js
+++ b/pkg/webui/console/views/application-mac-settings-profiles-list/index.js
@@ -37,19 +37,14 @@ const ApplicationMacSettingsProfilesList = () => {
     [appId],
   )
 
-  const baseDataSelectors = createSelector(
+  const baseDataSelector = createSelector(
     [selectMacSettingsProfiles, selectMacSettingsProfilesTotalCount],
-    (keys, totalCount) => ({
-      keys,
+    (macSettingsProfiles, totalCount) => ({
+      mac_settings_profiles: macSettingsProfiles,
       totalCount,
     }),
   )
 
-  const baseDataSelector = useCallback(
-    state => baseDataSelectors(state, appId),
-    [appId, baseDataSelectors],
-  )
-
   return (
     <div className="container container--xl">
       <IntlHelmet title={sharedMessages.macSettingsProfiles} />
diff --git a/sdk/js/src/service/network-server-mac-settings-profiles.js b/sdk/js/src/service/network-server-mac-settings-profiles.js
index 6ff738a714..b348146f18 100644
--- a/sdk/js/src/service/network-server-mac-settings-profiles.js
+++ b/sdk/js/src/service/network-server-mac-settings-profiles.js
@@ -45,6 +45,45 @@ class NsMACSettingsProfiles {
     )
     return Marshaler.payloadSingleResponse(result)
   }
+
+  async update(
+    applicationId,
+    macSettingsProfileId,
+    patch,
+    mask = Marshaler.fieldMaskFromPatch(
+      patch,
+      this._api.ClientRegistry.UpdateAllowedFieldMaskPaths,
+    ),
+  ) {
+    const result = await this._api.Update(
+      {
+        routeParams: {
+          'mac_settings_profile.ids.application_ids.application_id': applicationId,
+          'mac_settings_profile.ids.profile_id': macSettingsProfileId,
+        },
+      },
+      {
+        mac_settings_profile_ids: {
+          application_ids: { application_id: applicationId },
+          profile_id: macSettingsProfileId,
+        },
+        mac_settings_profile: patch,
+        field_mask: mask,
+      },
+    )
+    return Marshaler.payloadSingleResponse(result)
+  }
+
+  async delete(applicationId, profileId) {
+    const response = await this._api.Delete({
+      routeParams: {
+        'mac_settings_profile_ids.application_ids.application_id': applicationId,
+        'mac_settings_profile_ids.profile_id': profileId,
+      },
+    })
+
+    return Marshaler.payloadSingleResponse(response)
+  }
 }
 
 export default NsMACSettingsProfiles

From 56f58f1c48695491192998287bc12b9461cc147e Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 1 Sep 2025 09:20:38 +0200
Subject: [PATCH 03/17] console: Edit mac settings profile and create mac
 settings profile field

---
 .../components/mac-settings-section/index.js  |   2 +-
 .../mac-settings-profile-form/index.js        | 152 ++++++-
 pkg/webui/console/lib/regexp.js               |   1 +
 .../store/actions/mac-settings-profiles.js    |  29 +-
 .../logics/mac-settings-profiles.js           |  12 +
 .../store/reducers/mac-settings-profiles.js   |  25 +-
 .../store/selectors/mac-settings-profiles.js  |   3 +
 .../index.js                                  |   2 +-
 .../index.js                                  |  61 +++
 .../index.js                                  |  14 +-
 .../views/device-general-settings/index.js    |   4 +-
 .../network-server-form/index.js              |  38 +-
 pkg/webui/console/views/device/index.js       |   1 +
 pkg/webui/lib/shared-messages.js              |   3 +-
 pkg/webui/locales/en.json                     |   3 +-
 pkg/webui/locales/ja.json                     |   3 +-
 sdk/js/generated/api-definition.json          | 414 +++++++++---------
 .../network-server-mac-settings-profiles.js   |  25 +-
 18 files changed, 536 insertions(+), 256 deletions(-)
 create mode 100644 pkg/webui/console/views/application-mac-settings-profile-edit/index.js

diff --git a/pkg/webui/console/components/mac-settings-section/index.js b/pkg/webui/console/components/mac-settings-section/index.js
index c14b283eb4..74c840365e 100644
--- a/pkg/webui/console/components/mac-settings-section/index.js
+++ b/pkg/webui/console/components/mac-settings-section/index.js
@@ -207,7 +207,7 @@ const MacSettingsSection = props => {
   return (
     <Form.CollapseSection
       id="mac-settings"
-      title={sharedMessages.advancedMacSettings}
+      title={sharedMessages.customMacSettings}
       initiallyCollapsed={initiallyCollapsed}
       onCollapse={handleIsCollapsedChange}
       isCollapsed={isCollapsed}
diff --git a/pkg/webui/console/containers/mac-settings-profile-form/index.js b/pkg/webui/console/containers/mac-settings-profile-form/index.js
index fb9c621306..51fc8e6907 100644
--- a/pkg/webui/console/containers/mac-settings-profile-form/index.js
+++ b/pkg/webui/console/containers/mac-settings-profile-form/index.js
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { useCallback, useState } from 'react'
-import { get, set } from 'lodash'
+import React, { useCallback, useMemo, useState } from 'react'
+import { get, set, isEmpty, omitBy } from 'lodash'
 import { useDispatch } from 'react-redux'
 import { useNavigate, useParams } from 'react-router-dom'
 
@@ -35,10 +35,15 @@ import Message from '@ttn-lw/lib/components/message'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import tooltipIds from '@ttn-lw/lib/constants/tooltip-ids'
 import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
+import PropTypes from '@ttn-lw/lib/prop-types'
+import diff from '@ttn-lw/lib/diff'
 
 import { FRAME_WIDTH_COUNT, fCntWidthEncode, fCntWidthDecode } from '@console/lib/device-utils'
 
-import { createMacSettingsProfile } from '@console/store/actions/mac-settings-profiles'
+import {
+  createMacSettingsProfile,
+  updateMacSettingsProfile,
+} from '@console/store/actions/mac-settings-profiles'
 
 import { validationSchema, initialValues } from './form-validation'
 
@@ -77,6 +82,25 @@ const maxDutyCycleOptions = [
   { value: 'DUTY_CYCLE_16384', label: '0.006%' },
 ]
 
+const dataRateOverrideOptions = [
+  { value: 'data_rate_0', label: 'Data rate 0' },
+  { value: 'data_rate_1', label: 'Data rate 1' },
+  { value: 'data_rate_2', label: 'Data rate 2' },
+  { value: 'data_rate_3', label: 'Data rate 3' },
+  { value: 'data_rate_4', label: 'Data rate 4' },
+  { value: 'data_rate_5', label: 'Data rate 5' },
+  { value: 'data_rate_6', label: 'Data rate 6' },
+  { value: 'data_rate_7', label: 'Data rate 7' },
+  { value: 'data_rate_8', label: 'Data rate 8' },
+  { value: 'data_rate_9', label: 'Data rate 9' },
+  { value: 'data_rate_10', label: 'Data rate 10' },
+  { value: 'data_rate_11', label: 'Data rate 11' },
+  { value: 'data_rate_12', label: 'Data rate 12' },
+  { value: 'data_rate_13', label: 'Data rate 13' },
+  { value: 'data_rate_14', label: 'Data rate 14' },
+  { value: 'data_rate_15', label: 'Data rate 15' },
+]
+
 const MACSettingsProfileInnerForm = () => {
   const { values, setFieldValue, setFieldTouched } = useFormContext()
   const { mac_settings } = values
@@ -86,19 +110,12 @@ const MACSettingsProfileInnerForm = () => {
 
     setResetsFCnt(checked)
   }, [])
-  const alreadySelectedDataRates = Object.keys(mac_settings?.adr?.dynamic?.overrides || [])
-  const dataRateOverrideOptions = []
-  // Filter out the already selected data rate indices.
-  const dataRateFilterOption = useCallback(
-    option => !alreadySelectedDataRates.includes(option.value),
-    [alreadySelectedDataRates],
-  )
 
   const isDynamicAdr = mac_settings?.adr && 'dynamic' in mac_settings?.adr
   const isStaticAdr = mac_settings?.adr && 'static' in mac_settings?.adr
-  const adrOverrides = mac_settings?.adr.dynamic?.overrides
-  const showEditNbTrans = !values.mac_settings?.adr.dynamic?._use_default_nb_trans
-  const defaultNbTransDisabled = !values.mac_settings?.adr.dynamic?._override_nb_trans_defaults
+  const adrOverrides = mac_settings?.adr?.dynamic?.overrides
+  const showEditNbTrans = !values.mac_settings?.adr?.dynamic?._use_default_nb_trans
+  const defaultNbTransDisabled = !values.mac_settings?.adr?.dynamic?._override_nb_trans_defaults
   const addOverride = useCallback(() => {
     const newOverride = { _data_rate_index: '', min_nb_trans: '', max_nb_trans: '' }
     setFieldValue(
@@ -505,7 +522,6 @@ const MACSettingsProfileInnerForm = () => {
                         valueSetter={dataRateValueSetter}
                         component={Select}
                         options={dataRateOverrideOptions}
-                        filterOption={dataRateFilterOption}
                         className="d-flex direction-column flex-grow"
                       />
                       <Form.Field
@@ -597,14 +613,52 @@ const MACSettingsProfileInnerForm = () => {
   )
 }
 
-const MACSettingsProfileForm = () => {
+const MACSettingsProfileForm = ({ edit, macSettingsProfile, macSettingsProfileId }) => {
   const dispatch = useDispatch()
   const { appId } = useParams()
   const navigate = useNavigate()
   const [error, setError] = useState('')
 
+  const parsedInitialValues = useMemo(() => {
+    if (!macSettingsProfile) {
+      return initialValues
+    }
+    const normalizedInitialValues = {
+      ...initialValues,
+      ...macSettingsProfile,
+      mac_settings: {
+        ...initialValues.mac_settings,
+        ...macSettingsProfile?.mac_settings,
+        adr: Boolean(macSettingsProfile?.mac_settings?.adr?.dynamic)
+          ? {
+              dynamic: {
+                ...initialValues.mac_settings.adr.dynamic,
+                ...macSettingsProfile.mac_settings.adr.dynamic,
+                min_nb_trans: macSettingsProfile.mac_settings?.adr?.dynamic?.min_nb_trans ?? null,
+                max_nb_trans: macSettingsProfile.mac_settings?.adr?.dynamic?.max_nb_trans ?? null,
+                _use_default_nb_trans:
+                  !Boolean(macSettingsProfile.mac_settings?.adr?.dynamic?.min_nb_trans) &&
+                  !Boolean(macSettingsProfile.mac_settings?.adr?.dynamic?.overrides),
+                _override_nb_trans_defaults: Boolean(
+                  macSettingsProfile.mac_settings?.adr?.dynamic?.min_nb_trans,
+                ),
+              },
+            }
+          : Boolean(macSettingsProfile?.mac_settings?.adr?.static)
+            ? {
+                ...initialValues.mac_settings.adr,
+                ...macSettingsProfile.mac_settings.adr,
+              }
+            : {
+                disabled: {},
+              },
+      },
+    }
+    return validationSchema.cast(normalizedInitialValues)
+  }, [macSettingsProfile])
+
   const handleSubmit = useCallback(
-    async values => {
+    async (values, { setSubmitting }) => {
       const castedValues = validationSchema.cast(values)
       try {
         await dispatch(attachPromise(createMacSettingsProfile(appId, castedValues)))
@@ -614,25 +668,85 @@ const MACSettingsProfileForm = () => {
         })
         navigate(`/applications/${appId}/mac-settings-profiles`)
       } catch (error) {
+        setSubmitting(false)
         setError(error)
       }
     },
     [appId, dispatch, navigate],
   )
 
+  const handleEdit = useCallback(
+    async (_, { setSubmitting }, cleanedValues) => {
+      const profileDiff = diff(macSettingsProfile, cleanedValues)
+      try {
+        if (!isEmpty(profileDiff)) {
+          profileDiff.ids = {
+            application_ids: { application_id: appId },
+            profile_id: macSettingsProfileId,
+          }
+          if (profileDiff.mac_settings?.adr?.dynamic) {
+            const cleanAdr = omitBy(profileDiff.mac_settings?.adr?.dynamic, (_, key) =>
+              key.startsWith('_'),
+            )
+            profileDiff.mac_settings.adr.dynamic = cleanAdr
+          }
+
+          await dispatch(
+            attachPromise(updateMacSettingsProfile(appId, macSettingsProfileId, profileDiff)),
+          )
+        }
+        toast({
+          message: 'MAC settings profile updated',
+          type: toast.types.SUCCESS,
+        })
+      } catch (error) {
+        setSubmitting(false)
+        setError(error)
+      }
+    },
+    [appId, dispatch, macSettingsProfile, macSettingsProfileId],
+  )
+
   return (
     <Form
       validationSchema={validationSchema}
-      initialValues={initialValues}
-      onSubmit={handleSubmit}
+      initialValues={parsedInitialValues}
+      onSubmit={edit ? handleEdit : handleSubmit}
       error={error}
     >
       <MACSettingsProfileInnerForm />
       <SubmitBar>
-        <Form.Submit component={SubmitButton} message={sharedMessages.saveChanges} />
+        <Form.Submit
+          component={SubmitButton}
+          message={edit ? sharedMessages.saveChanges : 'Create MAC settings profile'}
+        />
       </SubmitBar>
     </Form>
   )
 }
 
+MACSettingsProfileForm.propTypes = {
+  edit: PropTypes.bool,
+  macSettingsProfile: PropTypes.shape({
+    ids: PropTypes.shape({}),
+    mac_settings: PropTypes.shape({
+      adr: PropTypes.shape({
+        dynamic: PropTypes.shape({
+          min_nb_trans: PropTypes.number,
+          max_nb_trans: PropTypes.number,
+          overrides: PropTypes.shape({}),
+        }),
+        static: PropTypes.shape({}),
+      }),
+    }),
+  }),
+  macSettingsProfileId: PropTypes.string,
+}
+
+MACSettingsProfileForm.defaultProps = {
+  edit: false,
+  macSettingsProfile: undefined,
+  macSettingsProfileId: undefined,
+}
+
 export default MACSettingsProfileForm
diff --git a/pkg/webui/console/lib/regexp.js b/pkg/webui/console/lib/regexp.js
index c829cc5b33..0bd231caaa 100644
--- a/pkg/webui/console/lib/regexp.js
+++ b/pkg/webui/console/lib/regexp.js
@@ -38,3 +38,4 @@ export const subnetMask =
   /^(?:255|254|252|248|240|224|192|128|0)\.((?:255|254|252|248|240|224|192|128|0)\.){2}(?:255|254|252|248|240|224|192|128|0)$/
 export const profileIdPath =
   /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i
+export const macSettingsProfileId = /^[a-z0-9](?:[-]?[a-z0-9]){2,}$/
diff --git a/pkg/webui/console/store/actions/mac-settings-profiles.js b/pkg/webui/console/store/actions/mac-settings-profiles.js
index 848ab36e76..d39b838b72 100644
--- a/pkg/webui/console/store/actions/mac-settings-profiles.js
+++ b/pkg/webui/console/store/actions/mac-settings-profiles.js
@@ -32,6 +32,23 @@ export const [
   },
 ] = createPaginationByParentRequestActions('MAC_SETTINGS_PROFILES')
 
+export const GET_MAC_SETTINGS_PROFILE_BASE = 'GET_MAC_SETTINGS_PROFILE'
+export const [
+  {
+    request: GET_MAC_SETTINGS_PROFILE,
+    success: GET_MAC_SETTINGS_PROFILE_SUCCESS,
+    failure: GET_MAC_SETTINGS_PROFILE_FAILURE,
+  },
+  {
+    request: getMacSettingsProfile,
+    success: getMacSettingsProfileSuccess,
+    failure: getMacSettingsProfileFailure,
+  },
+] = createRequestActions(GET_MAC_SETTINGS_PROFILE_BASE, (appId, macSettingsProfileId) => ({
+  appId,
+  macSettingsProfileId,
+}))
+
 export const CREATE_MAC_SETTINGS_PROFILE_BASE = 'CREATE_MAC_SETTINGS_PROFILE'
 export const [
   {
@@ -61,10 +78,14 @@ export const [
     success: updateMacSettingsProfileSuccess,
     failure: updateMacSettingsProfileFailure,
   },
-] = createRequestActions(UPDATE_MAC_SETTINGS_PROFILE_BASE, (appId, macSettingsProfile) => ({
-  appId,
-  macSettingsProfile,
-}))
+] = createRequestActions(
+  UPDATE_MAC_SETTINGS_PROFILE_BASE,
+  (appId, macSettingsProfileId, macSettingsProfile) => ({
+    appId,
+    macSettingsProfileId,
+    macSettingsProfile,
+  }),
+)
 
 export const DELETE_MAC_SETTINGS_PROFILE_BASE = 'DELETE_MAC_SETTINGS_PROFILE'
 export const [
diff --git a/pkg/webui/console/store/middleware/logics/mac-settings-profiles.js b/pkg/webui/console/store/middleware/logics/mac-settings-profiles.js
index 4575c0970d..72db49b5a2 100644
--- a/pkg/webui/console/store/middleware/logics/mac-settings-profiles.js
+++ b/pkg/webui/console/store/middleware/logics/mac-settings-profiles.js
@@ -19,6 +19,7 @@ import createRequestLogic from '@ttn-lw/lib/store/logics/create-request-logic'
 import {
   CREATE_MAC_SETTINGS_PROFILE,
   DELETE_MAC_SETTINGS_PROFILE,
+  GET_MAC_SETTINGS_PROFILE,
   GET_MAC_SETTINGS_PROFILES_LIST,
   UPDATE_MAC_SETTINGS_PROFILE,
 } from '@console/store/actions/mac-settings-profiles'
@@ -37,6 +38,16 @@ const getMacSettingsProfiles = createRequestLogic({
   },
 })
 
+const getMacSettingsProfile = createRequestLogic({
+  type: GET_MAC_SETTINGS_PROFILE,
+  process: async ({ action }) => {
+    const { appId, macSettingsProfileId } = action.payload
+    const data = await tts.NsMACSettingsProfiles.get(appId, macSettingsProfileId)
+
+    return data
+  },
+})
+
 const createMacSettingsProfile = createRequestLogic({
   type: CREATE_MAC_SETTINGS_PROFILE,
   process: async ({ action }) => {
@@ -73,6 +84,7 @@ const deleteMacSettingsProfile = createRequestLogic({
 
 export default [
   getMacSettingsProfiles,
+  getMacSettingsProfile,
   createMacSettingsProfile,
   updateMacSettingsProfile,
   deleteMacSettingsProfile,
diff --git a/pkg/webui/console/store/reducers/mac-settings-profiles.js b/pkg/webui/console/store/reducers/mac-settings-profiles.js
index 8beb0bb0d6..d59e16f6c4 100644
--- a/pkg/webui/console/store/reducers/mac-settings-profiles.js
+++ b/pkg/webui/console/store/reducers/mac-settings-profiles.js
@@ -12,7 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { GET_MAC_SETTINGS_PROFILES_LIST_SUCCESS } from '@console/store/actions/mac-settings-profiles'
+import {
+  CREATE_MAC_SETTINGS_PROFILE_SUCCESS,
+  GET_MAC_SETTINGS_PROFILE,
+  GET_MAC_SETTINGS_PROFILE_SUCCESS,
+  GET_MAC_SETTINGS_PROFILES_LIST_SUCCESS,
+  UPDATE_MAC_SETTINGS_PROFILE_SUCCESS,
+} from '@console/store/actions/mac-settings-profiles'
 
 const defaultState = {
   entities: {},
@@ -27,6 +33,23 @@ const macSettingsProfile = (state = {}, macSettingsProfile) => ({
 
 const macSettingsProfiles = (state = defaultState, { type, payload }) => {
   switch (type) {
+    case GET_MAC_SETTINGS_PROFILE:
+      return {
+        ...state,
+        selectedMacProfile: payload.macSettingsProfileId,
+      }
+    case GET_MAC_SETTINGS_PROFILE_SUCCESS:
+    case UPDATE_MAC_SETTINGS_PROFILE_SUCCESS:
+    case CREATE_MAC_SETTINGS_PROFILE_SUCCESS:
+      const id = payload.mac_settings_profile.ids.profile_id
+
+      return {
+        ...state,
+        entities: {
+          ...state.entities,
+          [id]: macSettingsProfile(state.entities[id], payload),
+        },
+      }
     case GET_MAC_SETTINGS_PROFILES_LIST_SUCCESS:
       const profiles = payload.entities.reduce(
         (acc, c) => {
diff --git a/pkg/webui/console/store/selectors/mac-settings-profiles.js b/pkg/webui/console/store/selectors/mac-settings-profiles.js
index 6e34599bb9..ea2b5799fa 100644
--- a/pkg/webui/console/store/selectors/mac-settings-profiles.js
+++ b/pkg/webui/console/store/selectors/mac-settings-profiles.js
@@ -28,3 +28,6 @@ export const selectMacSettingsProfiles = createSelector(
 )
 export const selectMacSettingsProfilesTotalCount = state =>
   selectMacSettingsProfilesStore(state).totalCount
+
+export const selectMacSettingsProfileById = (state, id) =>
+  selectMacSettingsProfilesEntitiesStore(state)[id]
diff --git a/pkg/webui/console/views/application-mac-settings-profile-add/index.js b/pkg/webui/console/views/application-mac-settings-profile-add/index.js
index 4078d00ba2..f916bdc669 100644
--- a/pkg/webui/console/views/application-mac-settings-profile-add/index.js
+++ b/pkg/webui/console/views/application-mac-settings-profile-add/index.js
@@ -43,7 +43,7 @@ const ApplicationMacSettingsProfilesAdd = () => {
   return (
     <RequireRequest requestAction={nsEnabled ? getNsFrequencyPlans() : undefined}>
       <div className="container container--lg grid">
-        <PageTitle title={'Create a new MAC setting profile'} className="mb-0" />
+        <PageTitle title={'Create a new MAC settings profile'} className="mb-0" />
         <div className="item-12">
           <MACSettingsProfileForm />
         </div>
diff --git a/pkg/webui/console/views/application-mac-settings-profile-edit/index.js b/pkg/webui/console/views/application-mac-settings-profile-edit/index.js
new file mode 100644
index 0000000000..6ab09c4a18
--- /dev/null
+++ b/pkg/webui/console/views/application-mac-settings-profile-edit/index.js
@@ -0,0 +1,61 @@
+// Copyright © 2025 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import React from 'react'
+import { useParams } from 'react-router-dom'
+import { useSelector } from 'react-redux'
+
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import PageTitle from '@ttn-lw/components/page-title'
+
+import RequireRequest from '@ttn-lw/lib/components/require-request'
+
+import MACSettingsProfileForm from '@console/containers/mac-settings-profile-form'
+
+import { getMacSettingsProfile } from '@console/store/actions/mac-settings-profiles'
+
+import { selectMacSettingsProfileById } from '@console/store/selectors/mac-settings-profiles'
+
+const ApplicationMacSettingsProfilesEdit = () => {
+  const { appId, macSettingsProfileId } = useParams()
+  const macSettingsProfile = useSelector(state =>
+    selectMacSettingsProfileById(state, macSettingsProfileId),
+  )
+
+  useBreadcrumbs(
+    'apps.single.mac-settings-profiles.single',
+    <Breadcrumb
+      path={`/applications/${appId}/mac-settings-profiles/${macSettingsProfileId}`}
+      content={macSettingsProfileId}
+    />,
+  )
+
+  return (
+    <RequireRequest requestAction={getMacSettingsProfile(appId, macSettingsProfileId)}>
+      <div className="container container--lg grid">
+        <PageTitle title={'Edit a MAC settings profile'} className="mb-0" />
+        <div className="item-12">
+          <MACSettingsProfileForm
+            edit
+            macSettingsProfile={macSettingsProfile?.mac_settings_profile}
+            macSettingsProfileId={macSettingsProfileId}
+          />
+        </div>
+      </div>
+    </RequireRequest>
+  )
+}
+
+export default ApplicationMacSettingsProfilesEdit
diff --git a/pkg/webui/console/views/application-mac-settings-profiles/index.js b/pkg/webui/console/views/application-mac-settings-profiles/index.js
index 35a7b8962e..3cb3858c19 100644
--- a/pkg/webui/console/views/application-mac-settings-profiles/index.js
+++ b/pkg/webui/console/views/application-mac-settings-profiles/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2025 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,9 +24,12 @@ import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
 
 import SubViewError from '@console/views/sub-view-error'
 import ApplicationMacSettingsProfilesList from '@console/views/application-mac-settings-profiles-list'
+import ApplicationMacSettingsProfilesAdd from '@console/views/application-mac-settings-profile-add'
+import ApplicationMacSettingsProfilesEdit from '@console/views/application-mac-settings-profile-edit'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import ApplicationMacSettingsProfilesAdd from '../application-mac-settings-profile-add'
+
+import { macSettingsProfileId } from '@console/lib/regexp'
 
 const ApplicationMacSettingsProfiles = () => {
   const { appId } = useParams()
@@ -44,15 +47,16 @@ const ApplicationMacSettingsProfiles = () => {
       <Routes>
         <Route index Component={ApplicationMacSettingsProfilesList} />
         <Route path="/add" Component={ApplicationMacSettingsProfilesAdd} />
-        {/* <Route
+        <Route
           path="/:macSettingsProfileId"
           element={
             <ValidateRouteParam
-              check={{ macSettingsProfileId: macSettingsProfileIdPathRegexp }}
+              check={{ macSettingsProfileId }}
+              otherwise={{ redirect: `/applications/${appId}/mac-settings-profiles` }}
               Component={ApplicationMacSettingsProfilesEdit}
             />
           }
-        /> */}
+        />
         <Route path="*" element={<GenericNotFound />} />
       </Routes>
     </ErrorView>
diff --git a/pkg/webui/console/views/device-general-settings/index.js b/pkg/webui/console/views/device-general-settings/index.js
index 77719254c5..8a43d6bd9d 100644
--- a/pkg/webui/console/views/device-general-settings/index.js
+++ b/pkg/webui/console/views/device-general-settings/index.js
@@ -51,6 +51,7 @@ import {
 } from '@console/store/actions/devices'
 import { unclaimDevice } from '@console/store/actions/claim'
 import { getBandsList, getNsFrequencyPlans } from '@console/store/actions/configuration'
+import { getMacSettingsProfilesList } from '@console/store/actions/mac-settings-profiles'
 
 import {
   selectSelectedDevice,
@@ -210,6 +211,7 @@ const DeviceGeneralSettings = () => {
 
   const fetchData = useCallback(
     async dispatch => {
+      await dispatch(getMacSettingsProfilesList(undefined, appId))
       if (device.frequency_plan_id && device.lorawan_phy_version) {
         let frequencyPlans = storeFrequencyPlans
         if (frequencyPlans.length === 0) {
@@ -250,7 +252,7 @@ const DeviceGeneralSettings = () => {
         }
       }
     },
-    [device.lorawan_phy_version, device.frequency_plan_id, storeFrequencyPlans],
+    [device.lorawan_phy_version, device.frequency_plan_id, storeFrequencyPlans, appId],
   )
 
   return (
diff --git a/pkg/webui/console/views/device-general-settings/network-server-form/index.js b/pkg/webui/console/views/device-general-settings/network-server-form/index.js
index 356d80d541..38f364e8a5 100644
--- a/pkg/webui/console/views/device-general-settings/network-server-form/index.js
+++ b/pkg/webui/console/views/device-general-settings/network-server-form/index.js
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React from 'react'
+import React, { useCallback } from 'react'
 import { defineMessages } from 'react-intl'
-import { useDispatch } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
 
 import Link from '@ttn-lw/components/link'
 import ModalButton from '@ttn-lw/components/button/modal-button'
@@ -26,6 +26,9 @@ import Form from '@ttn-lw/components/form'
 import Notification from '@ttn-lw/components/notification'
 import Checkbox from '@ttn-lw/components/checkbox'
 import toast from '@ttn-lw/components/toast'
+import Select from '@ttn-lw/components/select'
+import { IconX } from '@ttn-lw/components/icon'
+import Button from '@ttn-lw/components/button'
 
 import Message from '@ttn-lw/lib/components/message'
 
@@ -49,6 +52,8 @@ import {
   generate16BytesKey,
 } from '@console/lib/device-utils'
 
+import { selectMacSettingsProfiles } from '@console/store/selectors/mac-settings-profiles'
+
 import messages from '../messages'
 import {
   isDeviceABP,
@@ -113,6 +118,15 @@ const NetworkServerForm = React.memo(props => {
   const formRef = React.useRef(null)
 
   const [macSettings, setMacSettings] = React.useState(defaultMacSettings)
+  const macSettingsProfiles = useSelector(state => selectMacSettingsProfiles(state))
+  const macSettingsProfilesOptions = React.useMemo(
+    () =>
+      macSettingsProfiles.map(profile => ({
+        value: profile.ids.profile_id,
+        label: profile.ids.profile_id,
+      })),
+    [macSettingsProfiles],
+  )
 
   const [phyVersion, setPhyVersion] = React.useState(device.lorawan_phy_version)
   const phyVersionRef = React.useRef()
@@ -433,6 +447,10 @@ const NetworkServerForm = React.memo(props => {
     [initialValues],
   )
 
+  const handleRemoveMacSettingsProfile = useCallback(() => {
+    setFieldValue('mac_settings_profile_ids', [])
+  }, [])
+
   // Notify the user that the session keys might be there, but since there are
   // no rights to read the keys we cannot display them.
   const showResetNotification = !mayReadKeys && mayEditKeys && !Boolean(device.session)
@@ -592,6 +610,22 @@ const NetworkServerForm = React.memo(props => {
           onApprove={handleMacReset}
         />
       </Form.InfoField>
+      <Form.FieldContainer horizontal className="al-end">
+        <Form.Field
+          name="mac_settings_profile_ids"
+          title="MAC settings profile"
+          component={Select}
+          options={macSettingsProfilesOptions}
+          placeholder={sharedMessages.selectMacSettingsProfile}
+          fieldWidth="m"
+        />
+        <Button
+          secondary
+          icon={IconX}
+          message={sharedMessages.remove}
+          onClick={handleRemoveMacSettingsProfile}
+        />
+      </Form.FieldContainer>
       <MacSettingsSection
         activationMode={initialActivationMode}
         lorawanVersion={lorawanVersion}
diff --git a/pkg/webui/console/views/device/index.js b/pkg/webui/console/views/device/index.js
index 54c658ac9f..fa51720106 100644
--- a/pkg/webui/console/views/device/index.js
+++ b/pkg/webui/console/views/device/index.js
@@ -66,6 +66,7 @@ const deviceSelector = [
   'claim_authentication_code',
   'attributes',
   'skip_payload_crypto_override',
+  'mac_settings_profile_ids',
 ]
 
 const linkSelector = ['skip_payload_crypto', 'default_formatters']
diff --git a/pkg/webui/lib/shared-messages.js b/pkg/webui/lib/shared-messages.js
index e892a5eb73..482b1acdc3 100644
--- a/pkg/webui/lib/shared-messages.js
+++ b/pkg/webui/lib/shared-messages.js
@@ -564,6 +564,7 @@ export default defineMessages({
   secret: 'Secret',
   secure: 'Secure',
   security: 'Security',
+  selectMacSettingsProfile: 'Select MAC settings profile',
   sendInvitation: 'Send invitation',
   serverUrl: 'Server URL',
   serviceData: 'Service data',
@@ -705,7 +706,7 @@ export default defineMessages({
 
   delayValue: '{count, plural, one {{count} second} other {{count} seconds}}',
   factoryPresetFreqDescription: 'List of factory-preset frequencies. Note: order is respected.',
-  advancedMacSettings: 'Advanced MAC settings',
+  customMacSettings: 'Custom MAC settings',
   desiredPingSlotFrequencyTitle: 'Desired ping slot frequency',
   pingSlotPeriodicityDescription: 'Periodicity of the class B ping slot',
   pingSlotDataRateTitle: 'Ping slot data rate index',
diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
index 60c63453e9..761411025a 100644
--- a/pkg/webui/locales/en.json
+++ b/pkg/webui/locales/en.json
@@ -1695,6 +1695,7 @@
   "lib.shared-messages.secret": "Secret",
   "lib.shared-messages.secure": "Secure",
   "lib.shared-messages.security": "Security",
+  "lib.shared-messages.selectMacSettingsProfile": "Select MAC settings profile",
   "lib.shared-messages.sendInvitation": "Send invitation",
   "lib.shared-messages.serverUrl": "Server URL",
   "lib.shared-messages.serviceData": "Service data",
@@ -1830,7 +1831,7 @@
   "lib.shared-messages.wifiProfiles": "WiFi profiles",
   "lib.shared-messages.delayValue": "{count, plural, one {{count} second} other {{count} seconds}}",
   "lib.shared-messages.factoryPresetFreqDescription": "List of factory-preset frequencies. Note: order is respected.",
-  "lib.shared-messages.advancedMacSettings": "Advanced MAC settings",
+  "lib.shared-messages.customMacSettings": "Custom MAC settings",
   "lib.shared-messages.desiredPingSlotFrequencyTitle": "Desired ping slot frequency",
   "lib.shared-messages.pingSlotPeriodicityDescription": "Periodicity of the class B ping slot",
   "lib.shared-messages.pingSlotDataRateTitle": "Ping slot data rate index",
diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index b5625bc478..23f852cae0 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -1695,6 +1695,7 @@
   "lib.shared-messages.secret": "秘密",
   "lib.shared-messages.secure": "セキュア",
   "lib.shared-messages.security": "",
+  "lib.shared-messages.selectMacSettingsProfile": "",
   "lib.shared-messages.sendInvitation": "招待状送付",
   "lib.shared-messages.serverUrl": "サーバーURL",
   "lib.shared-messages.serviceData": "サービスデータ",
@@ -1830,7 +1831,7 @@
   "lib.shared-messages.wifiProfiles": "",
   "lib.shared-messages.delayValue": "",
   "lib.shared-messages.factoryPresetFreqDescription": "",
-  "lib.shared-messages.advancedMacSettings": "",
+  "lib.shared-messages.customMacSettings": "",
   "lib.shared-messages.desiredPingSlotFrequencyTitle": "",
   "lib.shared-messages.pingSlotPeriodicityDescription": "",
   "lib.shared-messages.pingSlotDataRateTitle": "",
diff --git a/sdk/js/generated/api-definition.json b/sdk/js/generated/api-definition.json
index 0dd792adc5..9cdca84c2e 100644
--- a/sdk/js/generated/api-definition.json
+++ b/sdk/js/generated/api-definition.json
@@ -4573,75 +4573,75 @@
         "lorawan_version",
         "mac_settings",
         "mac_settings.adr",
-        "mac_settings.adr.mode",
-        "mac_settings.adr.mode.disabled",
-        "mac_settings.adr.mode.dynamic",
-        "mac_settings.adr.mode.dynamic.channel_steering",
-        "mac_settings.adr.mode.dynamic.channel_steering.mode",
-        "mac_settings.adr.mode.dynamic.channel_steering.mode.disabled",
-        "mac_settings.adr.mode.dynamic.channel_steering.mode.lora_narrow",
-        "mac_settings.adr.mode.dynamic.margin",
-        "mac_settings.adr.mode.dynamic.max_data_rate_index",
-        "mac_settings.adr.mode.dynamic.max_data_rate_index.value",
-        "mac_settings.adr.mode.dynamic.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.max_tx_power_index",
-        "mac_settings.adr.mode.dynamic.min_data_rate_index",
-        "mac_settings.adr.mode.dynamic.min_data_rate_index.value",
-        "mac_settings.adr.mode.dynamic.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.min_tx_power_index",
-        "mac_settings.adr.mode.dynamic.overrides",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_0",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_0.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_0.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_1",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_1.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_1.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_10",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_10.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_10.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_11",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_11.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_11.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_12",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_12.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_12.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_13",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_13.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_13.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_14",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_14.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_14.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_15",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_15.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_15.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_2",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_2.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_2.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_3",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_3.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_3.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_4",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_4.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_4.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_5",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_5.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_5.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_6",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_6.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_6.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_7",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_7.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_7.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_8",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_8.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_8.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_9",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_9.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_9.min_nb_trans",
-        "mac_settings.adr.mode.static",
-        "mac_settings.adr.mode.static.data_rate_index",
-        "mac_settings.adr.mode.static.nb_trans",
-        "mac_settings.adr.mode.static.tx_power_index",
+        "mac_settings.adr",
+        "mac_settings.adr.disabled",
+        "mac_settings.adr.dynamic",
+        "mac_settings.adr.dynamic.channel_steering",
+        "mac_settings.adr.dynamic.channel_steering.mode",
+        "mac_settings.adr.dynamic.channel_steering.mode.disabled",
+        "mac_settings.adr.dynamic.channel_steering.mode.lora_narrow",
+        "mac_settings.adr.dynamic.margin",
+        "mac_settings.adr.dynamic.max_data_rate_index",
+        "mac_settings.adr.dynamic.max_data_rate_index.value",
+        "mac_settings.adr.dynamic.max_nb_trans",
+        "mac_settings.adr.dynamic.max_tx_power_index",
+        "mac_settings.adr.dynamic.min_data_rate_index",
+        "mac_settings.adr.dynamic.min_data_rate_index.value",
+        "mac_settings.adr.dynamic.min_nb_trans",
+        "mac_settings.adr.dynamic.min_tx_power_index",
+        "mac_settings.adr.dynamic.overrides",
+        "mac_settings.adr.dynamic.overrides.data_rate_0",
+        "mac_settings.adr.dynamic.overrides.data_rate_0.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_0.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_1",
+        "mac_settings.adr.dynamic.overrides.data_rate_1.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_1.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_10",
+        "mac_settings.adr.dynamic.overrides.data_rate_10.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_10.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_11",
+        "mac_settings.adr.dynamic.overrides.data_rate_11.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_11.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_12",
+        "mac_settings.adr.dynamic.overrides.data_rate_12.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_12.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_13",
+        "mac_settings.adr.dynamic.overrides.data_rate_13.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_13.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_14",
+        "mac_settings.adr.dynamic.overrides.data_rate_14.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_14.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_15",
+        "mac_settings.adr.dynamic.overrides.data_rate_15.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_15.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_2",
+        "mac_settings.adr.dynamic.overrides.data_rate_2.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_2.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_3",
+        "mac_settings.adr.dynamic.overrides.data_rate_3.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_3.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_4",
+        "mac_settings.adr.dynamic.overrides.data_rate_4.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_4.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_5",
+        "mac_settings.adr.dynamic.overrides.data_rate_5.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_5.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_6",
+        "mac_settings.adr.dynamic.overrides.data_rate_6.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_6.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_7",
+        "mac_settings.adr.dynamic.overrides.data_rate_7.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_7.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_8",
+        "mac_settings.adr.dynamic.overrides.data_rate_8.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_8.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_9",
+        "mac_settings.adr.dynamic.overrides.data_rate_9.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_9.min_nb_trans",
+        "mac_settings.adr.static",
+        "mac_settings.adr.static.data_rate_index",
+        "mac_settings.adr.static.nb_trans",
+        "mac_settings.adr.static.tx_power_index",
         "mac_settings.adr_margin",
         "mac_settings.beacon_frequency",
         "mac_settings.beacon_frequency.value",
@@ -5200,75 +5200,75 @@
         "lorawan_version",
         "mac_settings",
         "mac_settings.adr",
-        "mac_settings.adr.mode",
-        "mac_settings.adr.mode.disabled",
-        "mac_settings.adr.mode.dynamic",
-        "mac_settings.adr.mode.dynamic.channel_steering",
-        "mac_settings.adr.mode.dynamic.channel_steering.mode",
-        "mac_settings.adr.mode.dynamic.channel_steering.mode.disabled",
-        "mac_settings.adr.mode.dynamic.channel_steering.mode.lora_narrow",
-        "mac_settings.adr.mode.dynamic.margin",
-        "mac_settings.adr.mode.dynamic.max_data_rate_index",
-        "mac_settings.adr.mode.dynamic.max_data_rate_index.value",
-        "mac_settings.adr.mode.dynamic.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.max_tx_power_index",
-        "mac_settings.adr.mode.dynamic.min_data_rate_index",
-        "mac_settings.adr.mode.dynamic.min_data_rate_index.value",
-        "mac_settings.adr.mode.dynamic.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.min_tx_power_index",
-        "mac_settings.adr.mode.dynamic.overrides",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_0",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_0.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_0.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_1",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_1.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_1.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_10",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_10.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_10.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_11",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_11.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_11.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_12",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_12.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_12.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_13",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_13.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_13.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_14",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_14.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_14.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_15",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_15.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_15.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_2",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_2.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_2.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_3",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_3.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_3.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_4",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_4.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_4.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_5",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_5.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_5.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_6",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_6.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_6.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_7",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_7.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_7.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_8",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_8.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_8.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_9",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_9.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_9.min_nb_trans",
-        "mac_settings.adr.mode.static",
-        "mac_settings.adr.mode.static.data_rate_index",
-        "mac_settings.adr.mode.static.nb_trans",
-        "mac_settings.adr.mode.static.tx_power_index",
+        "mac_settings.adr",
+        "mac_settings.adr.disabled",
+        "mac_settings.adr.dynamic",
+        "mac_settings.adr.dynamic.channel_steering",
+        "mac_settings.adr.dynamic.channel_steering.mode",
+        "mac_settings.adr.dynamic.channel_steering.mode.disabled",
+        "mac_settings.adr.dynamic.channel_steering.mode.lora_narrow",
+        "mac_settings.adr.dynamic.margin",
+        "mac_settings.adr.dynamic.max_data_rate_index",
+        "mac_settings.adr.dynamic.max_data_rate_index.value",
+        "mac_settings.adr.dynamic.max_nb_trans",
+        "mac_settings.adr.dynamic.max_tx_power_index",
+        "mac_settings.adr.dynamic.min_data_rate_index",
+        "mac_settings.adr.dynamic.min_data_rate_index.value",
+        "mac_settings.adr.dynamic.min_nb_trans",
+        "mac_settings.adr.dynamic.min_tx_power_index",
+        "mac_settings.adr.dynamic.overrides",
+        "mac_settings.adr.dynamic.overrides.data_rate_0",
+        "mac_settings.adr.dynamic.overrides.data_rate_0.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_0.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_1",
+        "mac_settings.adr.dynamic.overrides.data_rate_1.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_1.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_10",
+        "mac_settings.adr.dynamic.overrides.data_rate_10.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_10.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_11",
+        "mac_settings.adr.dynamic.overrides.data_rate_11.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_11.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_12",
+        "mac_settings.adr.dynamic.overrides.data_rate_12.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_12.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_13",
+        "mac_settings.adr.dynamic.overrides.data_rate_13.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_13.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_14",
+        "mac_settings.adr.dynamic.overrides.data_rate_14.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_14.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_15",
+        "mac_settings.adr.dynamic.overrides.data_rate_15.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_15.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_2",
+        "mac_settings.adr.dynamic.overrides.data_rate_2.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_2.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_3",
+        "mac_settings.adr.dynamic.overrides.data_rate_3.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_3.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_4",
+        "mac_settings.adr.dynamic.overrides.data_rate_4.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_4.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_5",
+        "mac_settings.adr.dynamic.overrides.data_rate_5.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_5.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_6",
+        "mac_settings.adr.dynamic.overrides.data_rate_6.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_6.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_7",
+        "mac_settings.adr.dynamic.overrides.data_rate_7.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_7.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_8",
+        "mac_settings.adr.dynamic.overrides.data_rate_8.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_8.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_9",
+        "mac_settings.adr.dynamic.overrides.data_rate_9.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_9.min_nb_trans",
+        "mac_settings.adr.static",
+        "mac_settings.adr.static.data_rate_index",
+        "mac_settings.adr.static.nb_trans",
+        "mac_settings.adr.static.tx_power_index",
         "mac_settings.adr_margin",
         "mac_settings.beacon_frequency",
         "mac_settings.beacon_frequency.value",
@@ -5815,75 +5815,75 @@
         "lorawan_version",
         "mac_settings",
         "mac_settings.adr",
-        "mac_settings.adr.mode",
-        "mac_settings.adr.mode.disabled",
-        "mac_settings.adr.mode.dynamic",
-        "mac_settings.adr.mode.dynamic.channel_steering",
-        "mac_settings.adr.mode.dynamic.channel_steering.mode",
-        "mac_settings.adr.mode.dynamic.channel_steering.mode.disabled",
-        "mac_settings.adr.mode.dynamic.channel_steering.mode.lora_narrow",
-        "mac_settings.adr.mode.dynamic.margin",
-        "mac_settings.adr.mode.dynamic.max_data_rate_index",
-        "mac_settings.adr.mode.dynamic.max_data_rate_index.value",
-        "mac_settings.adr.mode.dynamic.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.max_tx_power_index",
-        "mac_settings.adr.mode.dynamic.min_data_rate_index",
-        "mac_settings.adr.mode.dynamic.min_data_rate_index.value",
-        "mac_settings.adr.mode.dynamic.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.min_tx_power_index",
-        "mac_settings.adr.mode.dynamic.overrides",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_0",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_0.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_0.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_1",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_1.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_1.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_10",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_10.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_10.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_11",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_11.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_11.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_12",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_12.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_12.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_13",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_13.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_13.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_14",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_14.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_14.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_15",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_15.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_15.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_2",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_2.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_2.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_3",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_3.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_3.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_4",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_4.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_4.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_5",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_5.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_5.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_6",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_6.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_6.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_7",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_7.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_7.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_8",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_8.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_8.min_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_9",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_9.max_nb_trans",
-        "mac_settings.adr.mode.dynamic.overrides.data_rate_9.min_nb_trans",
-        "mac_settings.adr.mode.static",
-        "mac_settings.adr.mode.static.data_rate_index",
-        "mac_settings.adr.mode.static.nb_trans",
-        "mac_settings.adr.mode.static.tx_power_index",
+        "mac_settings.adr",
+        "mac_settings.adr.disabled",
+        "mac_settings.adr.dynamic",
+        "mac_settings.adr.dynamic.channel_steering",
+        "mac_settings.adr.dynamic.channel_steering.mode",
+        "mac_settings.adr.dynamic.channel_steering.mode.disabled",
+        "mac_settings.adr.dynamic.channel_steering.mode.lora_narrow",
+        "mac_settings.adr.dynamic.margin",
+        "mac_settings.adr.dynamic.max_data_rate_index",
+        "mac_settings.adr.dynamic.max_data_rate_index.value",
+        "mac_settings.adr.dynamic.max_nb_trans",
+        "mac_settings.adr.dynamic.max_tx_power_index",
+        "mac_settings.adr.dynamic.min_data_rate_index",
+        "mac_settings.adr.dynamic.min_data_rate_index.value",
+        "mac_settings.adr.dynamic.min_nb_trans",
+        "mac_settings.adr.dynamic.min_tx_power_index",
+        "mac_settings.adr.dynamic.overrides",
+        "mac_settings.adr.dynamic.overrides.data_rate_0",
+        "mac_settings.adr.dynamic.overrides.data_rate_0.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_0.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_1",
+        "mac_settings.adr.dynamic.overrides.data_rate_1.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_1.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_10",
+        "mac_settings.adr.dynamic.overrides.data_rate_10.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_10.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_11",
+        "mac_settings.adr.dynamic.overrides.data_rate_11.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_11.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_12",
+        "mac_settings.adr.dynamic.overrides.data_rate_12.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_12.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_13",
+        "mac_settings.adr.dynamic.overrides.data_rate_13.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_13.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_14",
+        "mac_settings.adr.dynamic.overrides.data_rate_14.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_14.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_15",
+        "mac_settings.adr.dynamic.overrides.data_rate_15.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_15.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_2",
+        "mac_settings.adr.dynamic.overrides.data_rate_2.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_2.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_3",
+        "mac_settings.adr.dynamic.overrides.data_rate_3.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_3.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_4",
+        "mac_settings.adr.dynamic.overrides.data_rate_4.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_4.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_5",
+        "mac_settings.adr.dynamic.overrides.data_rate_5.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_5.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_6",
+        "mac_settings.adr.dynamic.overrides.data_rate_6.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_6.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_7",
+        "mac_settings.adr.dynamic.overrides.data_rate_7.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_7.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_8",
+        "mac_settings.adr.dynamic.overrides.data_rate_8.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_8.min_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_9",
+        "mac_settings.adr.dynamic.overrides.data_rate_9.max_nb_trans",
+        "mac_settings.adr.dynamic.overrides.data_rate_9.min_nb_trans",
+        "mac_settings.adr.static",
+        "mac_settings.adr.static.data_rate_index",
+        "mac_settings.adr.static.nb_trans",
+        "mac_settings.adr.static.tx_power_index",
         "mac_settings.adr_margin",
         "mac_settings.beacon_frequency",
         "mac_settings.beacon_frequency.value",
diff --git a/sdk/js/src/service/network-server-mac-settings-profiles.js b/sdk/js/src/service/network-server-mac-settings-profiles.js
index b348146f18..522f2b3fe9 100644
--- a/sdk/js/src/service/network-server-mac-settings-profiles.js
+++ b/sdk/js/src/service/network-server-mac-settings-profiles.js
@@ -34,6 +34,16 @@ class NsMACSettingsProfiles {
     return Marshaler.payloadListResponse('mac_settings_profiles', result)
   }
 
+  async get(applicationId, macSettingsProfileId) {
+    const result = await this._api.Get({
+      routeParams: {
+        'mac_settings_profile_ids.application_ids.application_id': applicationId,
+        'mac_settings_profile_ids.profile_id': macSettingsProfileId,
+      },
+    })
+    return Marshaler.payloadSingleResponse(result)
+  }
+
   async create(applicationId, macSettingsProfile) {
     const result = await this._api.Create(
       {
@@ -46,20 +56,12 @@ class NsMACSettingsProfiles {
     return Marshaler.payloadSingleResponse(result)
   }
 
-  async update(
-    applicationId,
-    macSettingsProfileId,
-    patch,
-    mask = Marshaler.fieldMaskFromPatch(
-      patch,
-      this._api.ClientRegistry.UpdateAllowedFieldMaskPaths,
-    ),
-  ) {
+  async update(applicationId, macSettingsProfileId, patch) {
     const result = await this._api.Update(
       {
         routeParams: {
-          'mac_settings_profile.ids.application_ids.application_id': applicationId,
-          'mac_settings_profile.ids.profile_id': macSettingsProfileId,
+          'mac_settings_profile_ids.application_ids.application_id': applicationId,
+          'mac_settings_profile_ids.profile_id': macSettingsProfileId,
         },
       },
       {
@@ -68,7 +70,6 @@ class NsMACSettingsProfiles {
           profile_id: macSettingsProfileId,
         },
         mac_settings_profile: patch,
-        field_mask: mask,
       },
     )
     return Marshaler.payloadSingleResponse(result)

From f20ad1fb313b1b7f688addff72facaf135d9ee2b Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 1 Sep 2025 15:34:23 +0200
Subject: [PATCH 04/17] console: Add action to create a new mac settings
 profile

---
 .../components/form/section/section.styl      |   2 +
 .../components/mac-settings-section/index.js  | 972 ++++++++++--------
 .../index.js                                  |  19 +-
 .../network-server-form/index.js              |  55 +-
 .../network-server-form/validation-schema.js  |   5 +
 pkg/webui/locales/en.json                     |   2 +
 pkg/webui/locales/ja.json                     |   2 +
 7 files changed, 559 insertions(+), 498 deletions(-)

diff --git a/pkg/webui/components/form/section/section.styl b/pkg/webui/components/form/section/section.styl
index eaabc12dcc..d72c0cad99 100644
--- a/pkg/webui/components/form/section/section.styl
+++ b/pkg/webui/components/form/section/section.styl
@@ -16,6 +16,8 @@
   reset-button()
   padding: $cs.s
   margin-left: -($cs.s)
+  display: flex
+  align-items: center
 
 .title
   margin: 0
diff --git a/pkg/webui/console/components/mac-settings-section/index.js b/pkg/webui/console/components/mac-settings-section/index.js
index 74c840365e..48cfa02c75 100644
--- a/pkg/webui/console/components/mac-settings-section/index.js
+++ b/pkg/webui/console/components/mac-settings-section/index.js
@@ -15,7 +15,9 @@
 import React, { useCallback } from 'react'
 import { createSelector } from 'reselect'
 import { useSelector } from 'react-redux'
-import { get, set } from 'lodash'
+import { get, isEmpty, set } from 'lodash'
+import { defineMessages, useIntl } from 'react-intl'
+import { useNavigate } from 'react-router-dom'
 
 import Form, { useFormContext } from '@ttn-lw/components/form'
 import Select from '@ttn-lw/components/select'
@@ -25,7 +27,8 @@ import KeyValueMap from '@ttn-lw/components/key-value-map'
 import Radio from '@ttn-lw/components/radio-button'
 import UnitInput from '@ttn-lw/components/unit-input'
 import Button from '@ttn-lw/components/button'
-import Icon from '@ttn-lw/components/icon'
+import Icon, { IconInfoCircle, IconPlus, IconTrash, IconX } from '@ttn-lw/components/icon'
+import Notification from '@ttn-lw/components/notification'
 
 import Message from '@ttn-lw/lib/components/message'
 
@@ -43,6 +46,13 @@ import {
 import getDataRate from '@console/lib/data-rate-utils'
 
 import { selectDataRates } from '@console/store/selectors/configuration'
+import { selectMacSettingsProfiles } from '@console/store/selectors/mac-settings-profiles'
+
+const m = defineMessages({
+  noMacSettingsProfiles: `You have no MAC settings profiles yet.`,
+  noMacSettingsProfilesAction:
+    'You have no MAC settings profiles yet. Create one to be able to assign it here.',
+})
 
 // 0...7
 const pingSlotPeriodicityOptions = Array.from({ length: 8 }, (_, index) => {
@@ -88,10 +98,23 @@ const MacSettingsSection = props => {
     isClassB,
     isClassC,
     bandId,
+    appId,
   } = props
 
+  const navigate = useNavigate()
+  const { formatMessage } = useIntl()
   const { values, setFieldValue, setFieldTouched } = useFormContext()
+
   const { mac_settings } = values
+  const macSettingsProfiles = useSelector(state => selectMacSettingsProfiles(state))
+  const macSettingsProfilesOptions = React.useMemo(
+    () =>
+      macSettingsProfiles.map(profile => ({
+        value: profile.ids.profile_id,
+        label: profile.ids.profile_id,
+      })),
+    [macSettingsProfiles],
+  )
   const alreadySelectedDataRates = Object.keys(mac_settings?.adr?.dynamic?.overrides || [])
   const dataRateOverrideOptions = useSelector(
     createSelector(
@@ -204,504 +227,559 @@ const MacSettingsSection = props => {
   const encodeAdrMode = value => ({ [value]: getEncodedAdrModeValue(value) })
   const decodeAdrMode = value => (value !== undefined ? Object.keys(value)[0] : null)
 
+  const handleRemoveMacSettingsProfile = useCallback(
+    e => {
+      e.preventDefault()
+      setFieldValue('mac_settings_profile_ids', null)
+    },
+    [setFieldValue],
+  )
+
+  const hasMacSettingsProfile = !isEmpty(values.mac_settings_profile_ids)
+
   return (
-    <Form.CollapseSection
-      id="mac-settings"
-      title={sharedMessages.customMacSettings}
-      initiallyCollapsed={initiallyCollapsed}
-      onCollapse={handleIsCollapsedChange}
-      isCollapsed={isCollapsed}
-    >
-      <Form.Field
-        title={sharedMessages.frameCounterWidth}
-        name="mac_settings.supports_32_bit_f_cnt"
-        component={Radio.Group}
-        encode={fCntWidthEncode}
-        decode={fCntWidthDecode}
-        tooltipId={tooltipIds.FRAME_COUNTER_WIDTH}
-        horizontal
-      >
-        <Radio label={sharedMessages['16Bit']} value={FRAME_WIDTH_COUNT.SUPPORTS_16_BIT} />
-        <Radio label={sharedMessages['32Bit']} value={FRAME_WIDTH_COUNT.SUPPORTS_32_BIT} />
-      </Form.Field>
-      {(isABP || isOTAA) && (
-        <>
-          <Form.FieldContainer horizontal>
-            {!isOTAA && (
-              <Form.Field
-                title={sharedMessages.rx1Delay}
-                type="number"
-                tooltipId={tooltipIds.RX1_DELAY}
-                append={<Message content={sharedMessages.secondsAbbreviated} />}
-                name="mac_settings.rx1_delay"
-                component={Input}
-                min={1}
-                max={15}
-                inputWidth="xs"
-                fieldWidth="xs"
-              />
-            )}
-            {!isMulticast && (
-              <Form.Field
-                title={sharedMessages.desiredRx1DelayTitle}
-                type="number"
-                name="mac_settings.desired_rx1_delay"
-                append={<Message content={sharedMessages.secondsAbbreviated} />}
-                tooltipId={tooltipIds.RX1_DELAY}
-                component={Input}
-                min={1}
-                max={15}
-                inputWidth="xs"
-                fieldWidth="xs"
-              />
-            )}
-          </Form.FieldContainer>
-          <Form.FieldContainer horizontal>
-            {!isOTAA && (
-              <Form.Field
-                title={sharedMessages.rx1DataRateOffset}
-                type="number"
-                name="mac_settings.rx1_data_rate_offset"
-                inputWidth="xxs"
-                fieldWidth="xs"
-                component={Input}
-                min={0}
-                max={7}
-                tooltipId={tooltipIds.DATA_RATE_OFFSET}
-              />
-            )}
-            {!isMulticast && (
-              <Form.Field
-                title={sharedMessages.desiredRx1DataRateOffsetTitle}
-                type="number"
-                inputWidth="xxs"
-                fieldWidth="xs"
-                name="mac_settings.desired_rx1_data_rate_offset"
-                component={Input}
-                min={0}
-                max={7}
-                tooltipId={tooltipIds.DATA_RATE_OFFSET}
-              />
-            )}
-          </Form.FieldContainer>
-          {!isOTAA && (
-            <Form.Field
-              label={sharedMessages.resetsFCnt}
-              onChange={handleResetsFCntChange}
-              warning={resetsFCnt ? sharedMessages.resetFCntWarning : undefined}
-              name="mac_settings.resets_f_cnt"
-              tooltipId={tooltipIds.RESETS_F_CNT}
-              component={Checkbox}
-            />
-          )}
-        </>
-      )}
-      <Form.FieldContainer horizontal>
-        {!isOTAA && (
-          <Form.Field
-            title={sharedMessages.rx2DataRateIndexTitle}
-            type="number"
-            name="mac_settings.rx2_data_rate_index"
-            component={Input}
-            min={0}
-            max={15}
-            tooltipId={tooltipIds.RX2_DATA_RATE_INDEX}
-            inputWidth="xxs"
-            fieldWidth="xs"
-          />
-        )}
-        {!isMulticast && (
-          <Form.Field
-            title={sharedMessages.desiredRx2DataRateIndexTitle}
-            type="number"
-            name="mac_settings.desired_rx2_data_rate_index"
-            component={Input}
-            min={0}
-            max={15}
-            inputWidth="xxs"
-            tooltipId={tooltipIds.RX2_DATA_RATE_INDEX}
-            fieldWidth="xs"
-          />
-        )}
-      </Form.FieldContainer>
-      <Form.FieldContainer horizontal>
-        {!isOTAA && (
-          <Form.Field
-            type="number"
-            min={100000}
-            step={100}
-            title={sharedMessages.rx2Frequency}
-            name="mac_settings.rx2_frequency"
-            component={UnitInput.Hertz}
-            tooltipId={tooltipIds.RX2_FREQUENCY}
-            fieldWidth="xs"
-          />
-        )}
-        {!isMulticast && (
-          <Form.Field
-            type="number"
-            min={100000}
-            step={100}
-            title={sharedMessages.desiredRx2FrequencyTitle}
-            name="mac_settings.desired_rx2_frequency"
-            component={UnitInput.Hertz}
-            tooltipId={tooltipIds.RX2_FREQUENCY}
-            fieldWidth="xs"
-          />
-        )}
-      </Form.FieldContainer>
-      <Form.FieldContainer horizontal>
-        {!isOTAA && (
-          <Form.Field
-            title={sharedMessages.maxDutyCycle}
-            name="mac_settings.max_duty_cycle"
-            component={Select}
-            options={maxDutyCycleOptions}
-            fieldWidth="xs"
-            tooltipId={tooltipIds.MAX_DUTY_CYCLE}
-          />
-        )}
-        {!isMulticast && (
-          <Form.Field
-            title={sharedMessages.desiredMaxDutyCycle}
-            name="mac_settings.desired_max_duty_cycle"
-            component={Select}
-            options={maxDutyCycleOptions}
-            fieldWidth="xs"
-            tooltipId={tooltipIds.MAX_DUTY_CYCLE}
-          />
-        )}
-      </Form.FieldContainer>
-      <Form.Field
-        indexAsKey
-        name="mac_settings.factory_preset_frequencies"
-        component={KeyValueMap}
-        title={sharedMessages.factoryPresetFrequencies}
-        description={sharedMessages.factoryPresetFreqDescription}
-        addMessage={sharedMessages.freqAdd}
-        valuePlaceholder={sharedMessages.frequencyPlaceholder}
-        tooltipId={tooltipIds.FACTORY_PRESET_FREQUENCIES}
-      />
-      {isClassC && (
+    <>
+      <Form.FieldContainer horizontal className="al-end">
         <Form.Field
-          title={sharedMessages.classCTimeout}
-          name="mac_settings.class_c_timeout"
-          tooltipId={tooltipIds.CLASS_C_TIMEOUT}
-          component={UnitInput.Duration}
-          unitSelector={['ms', 's']}
-          type="number"
-          fieldWidth="xs"
+          name="mac_settings_profile_ids.profile_id"
+          title="MAC settings profile"
+          component={Select}
+          options={macSettingsProfilesOptions}
+          placeholder={sharedMessages.selectMacSettingsProfile}
+          noOptionsMessage={() => formatMessage(m.noMacSettingsProfiles)}
+          fieldWidth="m"
+        />
+        <Button
+          secondary
+          icon={IconX}
+          message={sharedMessages.remove}
+          onClick={handleRemoveMacSettingsProfile}
+        />
+      </Form.FieldContainer>
+      {macSettingsProfilesOptions.length === 0 && (
+        <Notification
+          warning
+          content={m.noMacSettingsProfilesAction}
+          children={
+            <Button
+              icon={IconPlus}
+              onClick={() =>
+                navigate(`/applications/${appId}/mac-settings-profiles/add`, {
+                  replace: true,
+                })
+              }
+              message={'Create a new MAC profile'}
+              className="mt-cs-m"
+              secondary
+            />
+          }
+          small
         />
       )}
-      {(isClassB || isMulticast) && (
+      {!hasMacSettingsProfile && (
         <>
-          <Form.Field
-            title={sharedMessages.classBTimeout}
-            name="mac_settings.class_b_timeout"
-            tooltipId={tooltipIds.CLASS_B_TIMEOUT}
-            component={UnitInput.Duration}
-            unitSelector={['ms', 's']}
-            type="number"
-            fieldWidth="xs"
-          />
-          <Form.Field
-            title={sharedMessages.pingSlotPeriodicity}
-            description={sharedMessages.pingSlotPeriodicityDescription}
-            name="mac_settings.ping_slot_periodicity"
-            component={Select}
-            options={pingSlotPeriodicityOptions}
-            required={pingPeriodicityRequired}
-            menuPlacement="top"
-            fieldWidth="xs"
-          />
-          <Form.FieldContainer horizontal>
-            {!isOTAA && (
-              <Form.Field
-                type="number"
-                min={100000}
-                title={sharedMessages.beaconFrequency}
-                placeholder={sharedMessages.frequencyPlaceholder}
-                name="mac_settings.beacon_frequency"
-                tooltipId={tooltipIds.BEACON_FREQUENCY}
-                component={UnitInput.Hertz}
-                fieldWidth="xs"
-              />
-            )}
-            {!isMulticast && (
-              <Form.Field
-                type="number"
-                min={100000}
-                title={sharedMessages.desiredBeaconFrequency}
-                placeholder={sharedMessages.frequencyPlaceholder}
-                name="mac_settings.desired_beacon_frequency"
-                tooltipId={tooltipIds.BEACON_FREQUENCY}
-                component={UnitInput.Hertz}
-                fieldWidth="xs"
-              />
+          <hr className="mt-cs-xxl mb-cs-m" />
+          <Form.CollapseSection
+            id="mac-settings"
+            title={sharedMessages.customMacSettings}
+            initiallyCollapsed={initiallyCollapsed}
+            onCollapse={handleIsCollapsedChange}
+            isCollapsed={isCollapsed}
+          >
+            <Form.Field
+              title={sharedMessages.frameCounterWidth}
+              name="mac_settings.supports_32_bit_f_cnt"
+              component={Radio.Group}
+              encode={fCntWidthEncode}
+              decode={fCntWidthDecode}
+              tooltipId={tooltipIds.FRAME_COUNTER_WIDTH}
+              horizontal
+            >
+              <Radio label={sharedMessages['16Bit']} value={FRAME_WIDTH_COUNT.SUPPORTS_16_BIT} />
+              <Radio label={sharedMessages['32Bit']} value={FRAME_WIDTH_COUNT.SUPPORTS_32_BIT} />
+            </Form.Field>
+            {(isABP || isOTAA) && (
+              <>
+                <Form.FieldContainer horizontal>
+                  {!isOTAA && (
+                    <Form.Field
+                      title={sharedMessages.rx1Delay}
+                      type="number"
+                      tooltipId={tooltipIds.RX1_DELAY}
+                      append={<Message content={sharedMessages.secondsAbbreviated} />}
+                      name="mac_settings.rx1_delay"
+                      component={Input}
+                      min={1}
+                      max={15}
+                      inputWidth="xs"
+                      fieldWidth="xs"
+                    />
+                  )}
+                  {!isMulticast && (
+                    <Form.Field
+                      title={sharedMessages.desiredRx1DelayTitle}
+                      type="number"
+                      name="mac_settings.desired_rx1_delay"
+                      append={<Message content={sharedMessages.secondsAbbreviated} />}
+                      tooltipId={tooltipIds.RX1_DELAY}
+                      component={Input}
+                      min={1}
+                      max={15}
+                      inputWidth="xs"
+                      fieldWidth="xs"
+                    />
+                  )}
+                </Form.FieldContainer>
+                <Form.FieldContainer horizontal>
+                  {!isOTAA && (
+                    <Form.Field
+                      title={sharedMessages.rx1DataRateOffset}
+                      type="number"
+                      name="mac_settings.rx1_data_rate_offset"
+                      inputWidth="xxs"
+                      fieldWidth="xs"
+                      component={Input}
+                      min={0}
+                      max={7}
+                      tooltipId={tooltipIds.DATA_RATE_OFFSET}
+                    />
+                  )}
+                  {!isMulticast && (
+                    <Form.Field
+                      title={sharedMessages.desiredRx1DataRateOffsetTitle}
+                      type="number"
+                      inputWidth="xxs"
+                      fieldWidth="xs"
+                      name="mac_settings.desired_rx1_data_rate_offset"
+                      component={Input}
+                      min={0}
+                      max={7}
+                      tooltipId={tooltipIds.DATA_RATE_OFFSET}
+                    />
+                  )}
+                </Form.FieldContainer>
+                {!isOTAA && (
+                  <Form.Field
+                    label={sharedMessages.resetsFCnt}
+                    onChange={handleResetsFCntChange}
+                    warning={resetsFCnt ? sharedMessages.resetFCntWarning : undefined}
+                    name="mac_settings.resets_f_cnt"
+                    tooltipId={tooltipIds.RESETS_F_CNT}
+                    component={Checkbox}
+                  />
+                )}
+              </>
             )}
-          </Form.FieldContainer>
-          <Form.FieldContainer horizontal>
-            {!isOTAA && (
+            <Form.FieldContainer horizontal>
+              {!isOTAA && (
+                <Form.Field
+                  title={sharedMessages.rx2DataRateIndexTitle}
+                  type="number"
+                  name="mac_settings.rx2_data_rate_index"
+                  component={Input}
+                  min={0}
+                  max={15}
+                  tooltipId={tooltipIds.RX2_DATA_RATE_INDEX}
+                  inputWidth="xxs"
+                  fieldWidth="xs"
+                />
+              )}
+              {!isMulticast && (
+                <Form.Field
+                  title={sharedMessages.desiredRx2DataRateIndexTitle}
+                  type="number"
+                  name="mac_settings.desired_rx2_data_rate_index"
+                  component={Input}
+                  min={0}
+                  max={15}
+                  inputWidth="xxs"
+                  tooltipId={tooltipIds.RX2_DATA_RATE_INDEX}
+                  fieldWidth="xs"
+                />
+              )}
+            </Form.FieldContainer>
+            <Form.FieldContainer horizontal>
+              {!isOTAA && (
+                <Form.Field
+                  type="number"
+                  min={100000}
+                  step={100}
+                  title={sharedMessages.rx2Frequency}
+                  name="mac_settings.rx2_frequency"
+                  component={UnitInput.Hertz}
+                  tooltipId={tooltipIds.RX2_FREQUENCY}
+                  fieldWidth="xs"
+                />
+              )}
+              {!isMulticast && (
+                <Form.Field
+                  type="number"
+                  min={100000}
+                  step={100}
+                  title={sharedMessages.desiredRx2FrequencyTitle}
+                  name="mac_settings.desired_rx2_frequency"
+                  component={UnitInput.Hertz}
+                  tooltipId={tooltipIds.RX2_FREQUENCY}
+                  fieldWidth="xs"
+                />
+              )}
+            </Form.FieldContainer>
+            <Form.FieldContainer horizontal>
+              {!isOTAA && (
+                <Form.Field
+                  title={sharedMessages.maxDutyCycle}
+                  name="mac_settings.max_duty_cycle"
+                  component={Select}
+                  options={maxDutyCycleOptions}
+                  fieldWidth="xs"
+                  tooltipId={tooltipIds.MAX_DUTY_CYCLE}
+                />
+              )}
+              {!isMulticast && (
+                <Form.Field
+                  title={sharedMessages.desiredMaxDutyCycle}
+                  name="mac_settings.desired_max_duty_cycle"
+                  component={Select}
+                  options={maxDutyCycleOptions}
+                  fieldWidth="xs"
+                  tooltipId={tooltipIds.MAX_DUTY_CYCLE}
+                />
+              )}
+            </Form.FieldContainer>
+            <Form.Field
+              indexAsKey
+              name="mac_settings.factory_preset_frequencies"
+              component={KeyValueMap}
+              title={sharedMessages.factoryPresetFrequencies}
+              description={sharedMessages.factoryPresetFreqDescription}
+              addMessage={sharedMessages.freqAdd}
+              valuePlaceholder={sharedMessages.frequencyPlaceholder}
+              tooltipId={tooltipIds.FACTORY_PRESET_FREQUENCIES}
+            />
+            {isClassC && (
               <Form.Field
+                title={sharedMessages.classCTimeout}
+                name="mac_settings.class_c_timeout"
+                tooltipId={tooltipIds.CLASS_C_TIMEOUT}
+                component={UnitInput.Duration}
+                unitSelector={['ms', 's']}
                 type="number"
-                min={100000}
-                step={100}
-                title={sharedMessages.pingSlotFrequency}
-                placeholder={sharedMessages.frequencyPlaceholder}
-                name="mac_settings.ping_slot_frequency"
-                tooltipId={tooltipIds.PING_SLOT_FREQUENCY}
-                component={UnitInput.Hertz}
                 fieldWidth="xs"
               />
             )}
-            {!isMulticast && (
-              <Form.Field
-                type="number"
-                min={100000}
-                step={100}
-                title={sharedMessages.desiredPingSlotFrequencyTitle}
-                placeholder={sharedMessages.frequencyPlaceholder}
-                name="mac_settings.desired_ping_slot_frequency"
-                tooltipId={tooltipIds.PING_SLOT_FREQUENCY}
-                component={UnitInput.Hertz}
-                fieldWidth="xs"
-              />
+            {(isClassB || isMulticast) && (
+              <>
+                <Form.Field
+                  title={sharedMessages.classBTimeout}
+                  name="mac_settings.class_b_timeout"
+                  tooltipId={tooltipIds.CLASS_B_TIMEOUT}
+                  component={UnitInput.Duration}
+                  unitSelector={['ms', 's']}
+                  type="number"
+                  fieldWidth="xs"
+                />
+                <Form.Field
+                  title={sharedMessages.pingSlotPeriodicity}
+                  description={sharedMessages.pingSlotPeriodicityDescription}
+                  name="mac_settings.ping_slot_periodicity"
+                  component={Select}
+                  options={pingSlotPeriodicityOptions}
+                  required={pingPeriodicityRequired}
+                  menuPlacement="top"
+                  fieldWidth="xs"
+                />
+                <Form.FieldContainer horizontal>
+                  {!isOTAA && (
+                    <Form.Field
+                      type="number"
+                      min={100000}
+                      title={sharedMessages.beaconFrequency}
+                      placeholder={sharedMessages.frequencyPlaceholder}
+                      name="mac_settings.beacon_frequency"
+                      tooltipId={tooltipIds.BEACON_FREQUENCY}
+                      component={UnitInput.Hertz}
+                      fieldWidth="xs"
+                    />
+                  )}
+                  {!isMulticast && (
+                    <Form.Field
+                      type="number"
+                      min={100000}
+                      title={sharedMessages.desiredBeaconFrequency}
+                      placeholder={sharedMessages.frequencyPlaceholder}
+                      name="mac_settings.desired_beacon_frequency"
+                      tooltipId={tooltipIds.BEACON_FREQUENCY}
+                      component={UnitInput.Hertz}
+                      fieldWidth="xs"
+                    />
+                  )}
+                </Form.FieldContainer>
+                <Form.FieldContainer horizontal>
+                  {!isOTAA && (
+                    <Form.Field
+                      type="number"
+                      min={100000}
+                      step={100}
+                      title={sharedMessages.pingSlotFrequency}
+                      placeholder={sharedMessages.frequencyPlaceholder}
+                      name="mac_settings.ping_slot_frequency"
+                      tooltipId={tooltipIds.PING_SLOT_FREQUENCY}
+                      component={UnitInput.Hertz}
+                      fieldWidth="xs"
+                    />
+                  )}
+                  {!isMulticast && (
+                    <Form.Field
+                      type="number"
+                      min={100000}
+                      step={100}
+                      title={sharedMessages.desiredPingSlotFrequencyTitle}
+                      placeholder={sharedMessages.frequencyPlaceholder}
+                      name="mac_settings.desired_ping_slot_frequency"
+                      tooltipId={tooltipIds.PING_SLOT_FREQUENCY}
+                      component={UnitInput.Hertz}
+                      fieldWidth="xs"
+                    />
+                  )}
+                </Form.FieldContainer>
+                <Form.FieldContainer horizontal>
+                  {!isOTAA && (
+                    <Form.Field
+                      title={sharedMessages.pingSlotDataRateTitle}
+                      name="mac_settings.ping_slot_data_rate_index"
+                      tooltipId={tooltipIds.PING_SLOT_DATA_RATE_INDEX}
+                      component={Input}
+                      type="number"
+                      inputWidth="xxs"
+                      fieldWidth="xs"
+                      min={0}
+                      max={15}
+                    />
+                  )}
+                  {!isMulticast && (
+                    <Form.Field
+                      title={sharedMessages.desiredPingSlotDataRateTitle}
+                      name="mac_settings.desired_ping_slot_data_rate_index"
+                      tooltipId={tooltipIds.PING_SLOT_DATA_RATE_INDEX}
+                      component={Input}
+                      type="number"
+                      fieldWidth="xs"
+                      inputWidth="xxs"
+                      min={0}
+                      max={15}
+                    />
+                  )}
+                </Form.FieldContainer>
+              </>
             )}
-          </Form.FieldContainer>
-          <Form.FieldContainer horizontal>
-            {!isOTAA && (
+            <Form.FieldContainer horizontal>
               <Form.Field
-                title={sharedMessages.pingSlotDataRateTitle}
-                name="mac_settings.ping_slot_data_rate_index"
-                tooltipId={tooltipIds.PING_SLOT_DATA_RATE_INDEX}
+                title={sharedMessages.statusCountPeriodicity}
+                name="mac_settings.status_count_periodicity"
                 component={Input}
+                append={<Message content={sharedMessages.messages} />}
                 type="number"
-                inputWidth="xxs"
+                inputWidth="s"
                 fieldWidth="xs"
-                min={0}
-                max={15}
+                tooltipId={tooltipIds.STATUS_COUNT_PERIODICITY}
               />
-            )}
-            {!isMulticast && (
               <Form.Field
-                title={sharedMessages.desiredPingSlotDataRateTitle}
-                name="mac_settings.desired_ping_slot_data_rate_index"
-                tooltipId={tooltipIds.PING_SLOT_DATA_RATE_INDEX}
-                component={Input}
+                title={sharedMessages.statusTimePeriodicity}
+                name="mac_settings.status_time_periodicity"
+                component={UnitInput.Duration}
+                unitSelector={['ms', 's']}
                 type="number"
+                tooltipId={tooltipIds.STATUS_TIME_PERIODICITY}
                 fieldWidth="xs"
-                inputWidth="xxs"
-                min={0}
-                max={15}
               />
-            )}
-          </Form.FieldContainer>
-        </>
-      )}
-      <Form.FieldContainer horizontal>
-        <Form.Field
-          title={sharedMessages.statusCountPeriodicity}
-          name="mac_settings.status_count_periodicity"
-          component={Input}
-          append={<Message content={sharedMessages.messages} />}
-          type="number"
-          inputWidth="s"
-          fieldWidth="xs"
-          tooltipId={tooltipIds.STATUS_COUNT_PERIODICITY}
-        />
-        <Form.Field
-          title={sharedMessages.statusTimePeriodicity}
-          name="mac_settings.status_time_periodicity"
-          component={UnitInput.Duration}
-          unitSelector={['ms', 's']}
-          type="number"
-          tooltipId={tooltipIds.STATUS_TIME_PERIODICITY}
-          fieldWidth="xs"
-        />
-      </Form.FieldContainer>
-      <Form.Field
-        name="mac_settings.adr"
-        component={Radio.Group}
-        title={sharedMessages.adrAdaptiveDataRate}
-        tooltipId={tooltipIds.ADR_USE}
-        encode={encodeAdrMode}
-        decode={decodeAdrMode}
-      >
-        <Radio label={sharedMessages.adrDynamic} value="dynamic" />
-        <Radio label={sharedMessages.adrStatic} value="static" />
-        <Radio label={sharedMessages.disabled} value="disabled" />
-      </Form.Field>
-      {isDynamicAdr && (
-        <>
-          <Form.Field
-            title={sharedMessages.adrMargin}
-            name="mac_settings.adr.dynamic.margin"
-            component={Input}
-            type="number"
-            tooltipId={tooltipIds.ADR_MARGIN}
-            min={-100}
-            max={100}
-            inputWidth="xs"
-            append="dB"
-          />
-          <Form.Field
-            label={sharedMessages.useDefaultNbTrans}
-            name="mac_settings.adr.dynamic._use_default_nb_trans"
-            component={Checkbox}
-            tooltipId={tooltipIds.USE_DEFAULT_NB_TRANS}
-          />
-          {showEditNbTrans && (
-            <>
-              <Form.Field
-                title={sharedMessages.adrNbTrans}
-                name="mac_settings.adr.dynamic._override_nb_trans_defaults"
-                component={Checkbox}
-                label={sharedMessages.overrideNbTrans}
-              />
-              <Form.FieldContainer horizontal className="al-end mb-cs-xs">
+            </Form.FieldContainer>
+            <Form.Field
+              name="mac_settings.adr"
+              component={Radio.Group}
+              title={sharedMessages.adrAdaptiveDataRate}
+              tooltipId={tooltipIds.ADR_USE}
+              encode={encodeAdrMode}
+              decode={decodeAdrMode}
+            >
+              <Radio label={sharedMessages.adrDynamic} value="dynamic" />
+              <Radio label={sharedMessages.adrStatic} value="static" />
+              <Radio label={sharedMessages.disabled} value="disabled" />
+            </Form.Field>
+            {isDynamicAdr && (
+              <>
                 <Form.Field
-                  title={sharedMessages.minNbTrans}
-                  name="mac_settings.adr.dynamic.min_nb_trans"
+                  title={sharedMessages.adrMargin}
+                  name="mac_settings.adr.dynamic.margin"
                   component={Input}
                   type="number"
-                  min={1}
-                  max={3}
-                  disabled={defaultNbTransDisabled}
+                  tooltipId={tooltipIds.ADR_MARGIN}
+                  min={-100}
+                  max={100}
                   inputWidth="xs"
-                  className="d-flex direction-column"
+                  append="dB"
                 />
                 <Form.Field
-                  title={sharedMessages.maxNbTrans}
-                  name="mac_settings.adr.dynamic.max_nb_trans"
-                  component={Input}
-                  type="number"
-                  min={1}
-                  max={3}
-                  disabled={defaultNbTransDisabled}
-                  inputWidth="xs"
-                  className="d-flex direction-column"
+                  label={sharedMessages.useDefaultNbTrans}
+                  name="mac_settings.adr.dynamic._use_default_nb_trans"
+                  component={Checkbox}
+                  tooltipId={tooltipIds.USE_DEFAULT_NB_TRANS}
                 />
-                <Message content={sharedMessages.defaultForAllRates} className="mt-cs-xl" />
-              </Form.FieldContainer>
-              {!defaultNbTransDisabled && (
-                <div>
-                  <Icon icon="info" nudgeUp className="mr-cs-xxs" />
-                  <Message content={sharedMessages.defaultNbTransMessage} />
-                </div>
-              )}
-              <Form.InfoField
-                title={sharedMessages.specificOverrides}
-                tooltipId={tooltipIds.DATA_RATE_SPECIFIC_OVERRIDES}
-                className="mt-cs-m"
-              >
-                {adrOverrides &&
-                  Object.keys(adrOverrides).map(index => (
-                    <Form.FieldContainer horizontal className="al-end" key={index}>
-                      <Form.Field
-                        title={sharedMessages.dataRatePlaceholder}
-                        name={`mac_settings.adr.dynamic.overrides.${index}._data_rate_index`}
-                        valueSetter={dataRateValueSetter}
-                        component={Select}
-                        options={dataRateOverrideOptions}
-                        filterOption={dataRateFilterOption}
-                        inputWidth="s"
-                        fieldWidth="xxs"
-                        className="d-flex direction-column"
-                      />
+                {showEditNbTrans && (
+                  <>
+                    <Form.Field
+                      title={sharedMessages.adrNbTrans}
+                      name="mac_settings.adr.dynamic._override_nb_trans_defaults"
+                      component={Checkbox}
+                      label={sharedMessages.overrideNbTrans}
+                    />
+                    <Form.FieldContainer horizontal className="al-end mb-cs-xs">
                       <Form.Field
                         title={sharedMessages.minNbTrans}
-                        name={`mac_settings.adr.dynamic.overrides.${index}.min_nb_trans`}
+                        name="mac_settings.adr.dynamic.min_nb_trans"
                         component={Input}
-                        fieldWidth="xxs"
-                        className="d-flex direction-column"
                         type="number"
                         min={1}
                         max={3}
+                        disabled={defaultNbTransDisabled}
+                        inputWidth="xs"
+                        className="d-flex direction-column"
                       />
                       <Form.Field
                         title={sharedMessages.maxNbTrans}
-                        name={`mac_settings.adr.dynamic.overrides.${index}.max_nb_trans`}
+                        name="mac_settings.adr.dynamic.max_nb_trans"
                         component={Input}
-                        fieldWidth="xxs"
-                        className="d-flex direction-column"
                         type="number"
                         min={1}
                         max={3}
+                        disabled={defaultNbTransDisabled}
+                        inputWidth="xs"
+                        className="d-flex direction-column"
                       />
+                      <Message content={sharedMessages.defaultForAllRates} className="mt-cs-xl" />
+                    </Form.FieldContainer>
+                    {!defaultNbTransDisabled && (
+                      <div className="d-flex al-center c-text-neutral-semilight">
+                        <Icon icon={IconInfoCircle} className="mr-cs-xxs" />
+                        <Message content={sharedMessages.defaultNbTransMessage} />
+                      </div>
+                    )}
+                    <Form.InfoField
+                      title={sharedMessages.specificOverrides}
+                      tooltipId={tooltipIds.DATA_RATE_SPECIFIC_OVERRIDES}
+                      className="mt-cs-m"
+                    >
+                      {adrOverrides &&
+                        Object.keys(adrOverrides).map(index => (
+                          <Form.FieldContainer horizontal className="al-end" key={index}>
+                            <Form.Field
+                              title={sharedMessages.dataRatePlaceholder}
+                              name={`mac_settings.adr.dynamic.overrides.${index}._data_rate_index`}
+                              valueSetter={dataRateValueSetter}
+                              component={Select}
+                              options={dataRateOverrideOptions}
+                              filterOption={dataRateFilterOption}
+                              fieldWidth="quarter"
+                              className="d-flex direction-column"
+                            />
+                            <Form.Field
+                              title={sharedMessages.minNbTrans}
+                              name={`mac_settings.adr.dynamic.overrides.${index}.min_nb_trans`}
+                              component={Input}
+                              className="d-flex direction-column"
+                              type="number"
+                              min={1}
+                              max={3}
+                            />
+                            <Form.Field
+                              title={sharedMessages.maxNbTrans}
+                              name={`mac_settings.adr.dynamic.overrides.${index}.max_nb_trans`}
+                              component={Input}
+                              className="d-flex direction-column"
+                              type="number"
+                              min={1}
+                              max={3}
+                            />
+                            <Button
+                              type="button"
+                              onClick={handleRemoveButtonClick}
+                              icon={IconTrash}
+                              message={sharedMessages.remove}
+                              value={index}
+                              secondary
+                              danger
+                            />
+                          </Form.FieldContainer>
+                        ))}
                       <Button
                         type="button"
-                        onClick={handleRemoveButtonClick}
-                        icon="delete"
-                        message={sharedMessages.remove}
-                        value={index}
+                        message={sharedMessages.addSpecificOverride}
+                        onClick={addOverride}
+                        icon={IconPlus}
+                        secondary
                       />
-                    </Form.FieldContainer>
-                  ))}
-                <Button
-                  type="button"
-                  message={sharedMessages.addSpecificOverride}
-                  onClick={addOverride}
-                  icon="add"
+                    </Form.InfoField>
+                  </>
+                )}
+              </>
+            )}
+            {isStaticAdr && (
+              <>
+                <Form.Field
+                  title={sharedMessages.adrDataRate}
+                  name="mac_settings.adr.static.data_rate_index"
+                  component={Input}
+                  type="number"
+                  inputWidth="xs"
                 />
-              </Form.InfoField>
-            </>
-          )}
-        </>
-      )}
-      {isStaticAdr && (
-        <>
-          <Form.Field
-            title={sharedMessages.adrDataRate}
-            name="mac_settings.adr.static.data_rate_index"
-            component={Input}
-            type="number"
-            inputWidth="xs"
-          />
-          <Form.Field
-            title={sharedMessages.adrTransPower}
-            name="mac_settings.adr.static.tx_power_index"
-            component={Input}
-            type="number"
-            inputWidth="xs"
-            max={15}
-          />
-          <Form.Field
-            title={sharedMessages.adrUplinks}
-            name="mac_settings.adr.static.nb_trans"
-            component={Input}
-            type="number"
-            inputWidth="xs"
-            min={1}
-            max={15}
-          />
-        </>
-      )}
-      {isNewLorawanVersion && !isMulticast && (
-        <>
-          <Form.Field
-            title={sharedMessages.desiredAdrAckLimit}
-            name="mac_settings.desired_adr_ack_limit_exponent"
-            component={Select}
-            options={adrAckLimitOptions}
-            tooltipId={tooltipIds.ADR_ACK_LIMIT}
-            fieldWidth="xs"
-          />
-          <Form.Field
-            title={sharedMessages.desiredAdrAckDelay}
-            name="mac_settings.desired_adr_ack_delay_exponent"
-            component={Select}
-            options={adrAckDelayOptions}
-            tooltipId={tooltipIds.ADR_ACK_DELAY}
-            fieldWidth="xs"
-          />
+                <Form.Field
+                  title={sharedMessages.adrTransPower}
+                  name="mac_settings.adr.static.tx_power_index"
+                  component={Input}
+                  type="number"
+                  inputWidth="xs"
+                  max={15}
+                />
+                <Form.Field
+                  title={sharedMessages.adrUplinks}
+                  name="mac_settings.adr.static.nb_trans"
+                  component={Input}
+                  type="number"
+                  inputWidth="xs"
+                  min={1}
+                  max={15}
+                />
+              </>
+            )}
+            {isNewLorawanVersion && !isMulticast && (
+              <>
+                <Form.Field
+                  title={sharedMessages.desiredAdrAckLimit}
+                  name="mac_settings.desired_adr_ack_limit_exponent"
+                  component={Select}
+                  options={adrAckLimitOptions}
+                  tooltipId={tooltipIds.ADR_ACK_LIMIT}
+                  fieldWidth="xs"
+                />
+                <Form.Field
+                  title={sharedMessages.desiredAdrAckDelay}
+                  name="mac_settings.desired_adr_ack_delay_exponent"
+                  component={Select}
+                  options={adrAckDelayOptions}
+                  tooltipId={tooltipIds.ADR_ACK_DELAY}
+                  fieldWidth="xs"
+                />
+              </>
+            )}
+          </Form.CollapseSection>
         </>
       )}
-    </Form.CollapseSection>
+    </>
   )
 }
 
 MacSettingsSection.propTypes = {
   activationMode: PropTypes.oneOf(Object.values(ACTIVATION_MODES)).isRequired,
+  appId: PropTypes.string.isRequired,
   bandId: PropTypes.string.isRequired,
   initiallyCollapsed: PropTypes.bool,
   isClassB: PropTypes.bool,
diff --git a/pkg/webui/console/views/application-mac-settings-profile-add/index.js b/pkg/webui/console/views/application-mac-settings-profile-add/index.js
index f916bdc669..da587d0390 100644
--- a/pkg/webui/console/views/application-mac-settings-profile-add/index.js
+++ b/pkg/webui/console/views/application-mac-settings-profile-add/index.js
@@ -19,16 +19,9 @@ import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
 import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 import PageTitle from '@ttn-lw/components/page-title'
 
-import RequireRequest from '@ttn-lw/lib/components/require-request'
-
 import MACSettingsProfileForm from '@console/containers/mac-settings-profile-form'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import { selectNsConfig } from '@ttn-lw/lib/selectors/env'
-
-import { getNsFrequencyPlans } from '@console/store/actions/configuration'
-
-const nsEnabled = selectNsConfig().enabled
 
 const ApplicationMacSettingsProfilesAdd = () => {
   const { appId } = useParams()
@@ -41,14 +34,12 @@ const ApplicationMacSettingsProfilesAdd = () => {
   )
 
   return (
-    <RequireRequest requestAction={nsEnabled ? getNsFrequencyPlans() : undefined}>
-      <div className="container container--lg grid">
-        <PageTitle title={'Create a new MAC settings profile'} className="mb-0" />
-        <div className="item-12">
-          <MACSettingsProfileForm />
-        </div>
+    <div className="container container--lg grid">
+      <PageTitle title={'Create a new MAC settings profile'} className="mb-0" />
+      <div className="item-12">
+        <MACSettingsProfileForm />
       </div>
-    </RequireRequest>
+    </div>
   )
 }
 
diff --git a/pkg/webui/console/views/device-general-settings/network-server-form/index.js b/pkg/webui/console/views/device-general-settings/network-server-form/index.js
index 38f364e8a5..b9b39623b7 100644
--- a/pkg/webui/console/views/device-general-settings/network-server-form/index.js
+++ b/pkg/webui/console/views/device-general-settings/network-server-form/index.js
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { useCallback } from 'react'
+import React from 'react'
 import { defineMessages } from 'react-intl'
-import { useDispatch, useSelector } from 'react-redux'
+import { useDispatch } from 'react-redux'
 
 import Link from '@ttn-lw/components/link'
 import ModalButton from '@ttn-lw/components/button/modal-button'
@@ -26,9 +26,6 @@ import Form from '@ttn-lw/components/form'
 import Notification from '@ttn-lw/components/notification'
 import Checkbox from '@ttn-lw/components/checkbox'
 import toast from '@ttn-lw/components/toast'
-import Select from '@ttn-lw/components/select'
-import { IconX } from '@ttn-lw/components/icon'
-import Button from '@ttn-lw/components/button'
 
 import Message from '@ttn-lw/lib/components/message'
 
@@ -52,8 +49,6 @@ import {
   generate16BytesKey,
 } from '@console/lib/device-utils'
 
-import { selectMacSettingsProfiles } from '@console/store/selectors/mac-settings-profiles'
-
 import messages from '../messages'
 import {
   isDeviceABP,
@@ -118,15 +113,6 @@ const NetworkServerForm = React.memo(props => {
   const formRef = React.useRef(null)
 
   const [macSettings, setMacSettings] = React.useState(defaultMacSettings)
-  const macSettingsProfiles = useSelector(state => selectMacSettingsProfiles(state))
-  const macSettingsProfilesOptions = React.useMemo(
-    () =>
-      macSettingsProfiles.map(profile => ({
-        value: profile.ids.profile_id,
-        label: profile.ids.profile_id,
-      })),
-    [macSettingsProfiles],
-  )
 
   const [phyVersion, setPhyVersion] = React.useState(device.lorawan_phy_version)
   const phyVersionRef = React.useRef()
@@ -368,6 +354,20 @@ const NetworkServerForm = React.memo(props => {
         patch.mac_settings.use_adr = null
       }
 
+      if (Boolean(patch.mac_settings_profile_ids)) {
+        patch.mac_settings_profile_ids = {
+          ...patch.mac_settings_profile_ids,
+          application_ids: {
+            application_id: appId,
+          },
+        }
+        patch.frequency_plan_id = device.frequency_plan_id
+        patch.lorawan_version = device.lorawan_version
+        patch.lorawan_phy_version = device.lorawan_phy_version
+
+        delete patch.mac_settings
+      }
+
       setError('')
       try {
         await onSubmit(patch)
@@ -378,7 +378,7 @@ const NetworkServerForm = React.memo(props => {
         setError(err)
       }
     },
-    [device, onSubmit, onSubmitSuccess, validationContext],
+    [device, onSubmit, onSubmitSuccess, validationContext, appId],
   )
 
   const handleDeviceClassChange = React.useCallback(
@@ -447,10 +447,6 @@ const NetworkServerForm = React.memo(props => {
     [initialValues],
   )
 
-  const handleRemoveMacSettingsProfile = useCallback(() => {
-    setFieldValue('mac_settings_profile_ids', [])
-  }, [])
-
   // Notify the user that the session keys might be there, but since there are
   // no rights to read the keys we cannot display them.
   const showResetNotification = !mayReadKeys && mayEditKeys && !Boolean(device.session)
@@ -610,28 +606,13 @@ const NetworkServerForm = React.memo(props => {
           onApprove={handleMacReset}
         />
       </Form.InfoField>
-      <Form.FieldContainer horizontal className="al-end">
-        <Form.Field
-          name="mac_settings_profile_ids"
-          title="MAC settings profile"
-          component={Select}
-          options={macSettingsProfilesOptions}
-          placeholder={sharedMessages.selectMacSettingsProfile}
-          fieldWidth="m"
-        />
-        <Button
-          secondary
-          icon={IconX}
-          message={sharedMessages.remove}
-          onClick={handleRemoveMacSettingsProfile}
-        />
-      </Form.FieldContainer>
       <MacSettingsSection
         activationMode={initialActivationMode}
         lorawanVersion={lorawanVersion}
         isClassB={isClassB}
         isClassC={isClassC}
         bandId={bandId}
+        appId={appId}
       />
       <SubmitBar>
         <Form.Submit component={SubmitButton} message={sharedMessages.saveChanges} />
diff --git a/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js b/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js
index 904a1baa26..81ca41e295 100644
--- a/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js
+++ b/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js
@@ -461,6 +461,11 @@ const validationSchema = Yup.object()
         })
       },
     ),
+    mac_settings_profile_ids: Yup.object()
+      .shape({
+        profile_id: Yup.string(),
+      })
+      .nullable(),
   })
   .noUnknown()
 
diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
index 761411025a..aebfa58234 100644
--- a/pkg/webui/locales/en.json
+++ b/pkg/webui/locales/en.json
@@ -177,6 +177,8 @@
   "console.components.location-form.index.noLocationSetInfo": "There is currently no manual location information set",
   "console.components.location-form.index.updateSuccess": "Location updated",
   "console.components.lorawan-version-input.index.phyVersionError": "Failed to fetch regional parameters versions",
+  "console.components.mac-settings-section.index.noMacSettingsProfiles": "You have no MAC settings profiles yet.",
+  "console.components.mac-settings-section.index.noMacSettingsProfilesAction": "You have no MAC settings profiles yet. Create one to be able to assign it here.",
   "console.components.notifications.templates.api-key-changed.title": "API key of {entityType} has been changed",
   "console.components.notifications.templates.api-key-changed.body": "An API key of your {entityType} <code>{id}</code> on your network has been changed.",
   "console.components.notifications.templates.api-key-changed.preview": "An API key of your {entityType} \"{id}\" on your network has been changed. API Key ID: {apiKeyId}",
diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index 23f852cae0..6d3039411e 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -177,6 +177,8 @@
   "console.components.location-form.index.noLocationSetInfo": "",
   "console.components.location-form.index.updateSuccess": "",
   "console.components.lorawan-version-input.index.phyVersionError": "",
+  "console.components.mac-settings-section.index.noMacSettingsProfiles": "",
+  "console.components.mac-settings-section.index.noMacSettingsProfilesAction": "",
   "console.components.notifications.templates.api-key-changed.title": "",
   "console.components.notifications.templates.api-key-changed.body": "",
   "console.components.notifications.templates.api-key-changed.preview": "",

From a7e0fbf1df6f2447761eb6c77285254b3ee2e780 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 1 Sep 2025 15:45:51 +0200
Subject: [PATCH 05/17] console: Fix messages

---
 .../console/components/mac-settings-section/index.js |  5 +++--
 .../containers/mac-settings-profile-form/index.js    | 12 +++++++++---
 .../containers/mac-settings-profiles-table/index.js  |  2 +-
 .../application-mac-settings-profile-add/index.js    |  2 +-
 .../application-mac-settings-profile-edit/index.js   |  7 ++++++-
 pkg/webui/lib/shared-messages.js                     |  1 +
 pkg/webui/locales/en.json                            |  5 +++++
 pkg/webui/locales/ja.json                            |  5 +++++
 8 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/pkg/webui/console/components/mac-settings-section/index.js b/pkg/webui/console/components/mac-settings-section/index.js
index 48cfa02c75..73a2fa52f5 100644
--- a/pkg/webui/console/components/mac-settings-section/index.js
+++ b/pkg/webui/console/components/mac-settings-section/index.js
@@ -52,6 +52,7 @@ const m = defineMessages({
   noMacSettingsProfiles: `You have no MAC settings profiles yet.`,
   noMacSettingsProfilesAction:
     'You have no MAC settings profiles yet. Create one to be able to assign it here.',
+  macSettingsProfile: 'MAC settings profile',
 })
 
 // 0...7
@@ -242,7 +243,7 @@ const MacSettingsSection = props => {
       <Form.FieldContainer horizontal className="al-end">
         <Form.Field
           name="mac_settings_profile_ids.profile_id"
-          title="MAC settings profile"
+          title={m.macSettingsProfile}
           component={Select}
           options={macSettingsProfilesOptions}
           placeholder={sharedMessages.selectMacSettingsProfile}
@@ -268,7 +269,7 @@ const MacSettingsSection = props => {
                   replace: true,
                 })
               }
-              message={'Create a new MAC profile'}
+              message={m.createMacSettingsProfile}
               className="mt-cs-m"
               secondary
             />
diff --git a/pkg/webui/console/containers/mac-settings-profile-form/index.js b/pkg/webui/console/containers/mac-settings-profile-form/index.js
index 51fc8e6907..29d935b339 100644
--- a/pkg/webui/console/containers/mac-settings-profile-form/index.js
+++ b/pkg/webui/console/containers/mac-settings-profile-form/index.js
@@ -16,6 +16,7 @@ import React, { useCallback, useMemo, useState } from 'react'
 import { get, set, isEmpty, omitBy } from 'lodash'
 import { useDispatch } from 'react-redux'
 import { useNavigate, useParams } from 'react-router-dom'
+import { defineMessages } from 'react-intl'
 
 import Form, { useFormContext } from '@ttn-lw/components/form'
 import Radio from '@ttn-lw/components/radio-button'
@@ -47,6 +48,11 @@ import {
 
 import { validationSchema, initialValues } from './form-validation'
 
+const m = defineMessages({
+  updated: 'MAC settings profile updated',
+  created: 'MAC settings profile created',
+})
+
 // 0...7
 const pingSlotPeriodicityOptions = Array.from({ length: 8 }, (_, index) => {
   const value = Math.pow(2, index)
@@ -663,7 +669,7 @@ const MACSettingsProfileForm = ({ edit, macSettingsProfile, macSettingsProfileId
       try {
         await dispatch(attachPromise(createMacSettingsProfile(appId, castedValues)))
         toast({
-          message: 'MAC settings profile created',
+          message: m.created,
           type: toast.types.SUCCESS,
         })
         navigate(`/applications/${appId}/mac-settings-profiles`)
@@ -696,7 +702,7 @@ const MACSettingsProfileForm = ({ edit, macSettingsProfile, macSettingsProfileId
           )
         }
         toast({
-          message: 'MAC settings profile updated',
+          message: m.updated,
           type: toast.types.SUCCESS,
         })
       } catch (error) {
@@ -718,7 +724,7 @@ const MACSettingsProfileForm = ({ edit, macSettingsProfile, macSettingsProfileId
       <SubmitBar>
         <Form.Submit
           component={SubmitButton}
-          message={edit ? sharedMessages.saveChanges : 'Create MAC settings profile'}
+          message={edit ? sharedMessages.saveChanges : sharedMessages.createMacSettingsProfile}
         />
       </SubmitBar>
     </Form>
diff --git a/pkg/webui/console/containers/mac-settings-profiles-table/index.js b/pkg/webui/console/containers/mac-settings-profiles-table/index.js
index 01badd33d4..41e59d65d1 100644
--- a/pkg/webui/console/containers/mac-settings-profiles-table/index.js
+++ b/pkg/webui/console/containers/mac-settings-profiles-table/index.js
@@ -135,7 +135,7 @@ const MacSettingsProfilesTable = props => {
         entity="mac_settings_profiles"
         defaultOrder="-ids.profile_id"
         headers={headers}
-        addMessage={'Create MAC settings profile'}
+        addMessage={m.createMacSettingsProfile}
         baseDataSelector={baseDataSelector}
         getItemsAction={getItemsAction}
         clickable={false}
diff --git a/pkg/webui/console/views/application-mac-settings-profile-add/index.js b/pkg/webui/console/views/application-mac-settings-profile-add/index.js
index da587d0390..685ab6cf52 100644
--- a/pkg/webui/console/views/application-mac-settings-profile-add/index.js
+++ b/pkg/webui/console/views/application-mac-settings-profile-add/index.js
@@ -35,7 +35,7 @@ const ApplicationMacSettingsProfilesAdd = () => {
 
   return (
     <div className="container container--lg grid">
-      <PageTitle title={'Create a new MAC settings profile'} className="mb-0" />
+      <PageTitle title={sharedMessages.createMacSettingsProfile} className="mb-0" />
       <div className="item-12">
         <MACSettingsProfileForm />
       </div>
diff --git a/pkg/webui/console/views/application-mac-settings-profile-edit/index.js b/pkg/webui/console/views/application-mac-settings-profile-edit/index.js
index 6ab09c4a18..b9446363b6 100644
--- a/pkg/webui/console/views/application-mac-settings-profile-edit/index.js
+++ b/pkg/webui/console/views/application-mac-settings-profile-edit/index.js
@@ -15,6 +15,7 @@
 import React from 'react'
 import { useParams } from 'react-router-dom'
 import { useSelector } from 'react-redux'
+import { defineMessages } from 'react-intl'
 
 import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
@@ -28,6 +29,10 @@ import { getMacSettingsProfile } from '@console/store/actions/mac-settings-profi
 
 import { selectMacSettingsProfileById } from '@console/store/selectors/mac-settings-profiles'
 
+const m = defineMessages({
+  editMacSettingsProfile: 'Edit a MAC settings profile',
+})
+
 const ApplicationMacSettingsProfilesEdit = () => {
   const { appId, macSettingsProfileId } = useParams()
   const macSettingsProfile = useSelector(state =>
@@ -45,7 +50,7 @@ const ApplicationMacSettingsProfilesEdit = () => {
   return (
     <RequireRequest requestAction={getMacSettingsProfile(appId, macSettingsProfileId)}>
       <div className="container container--lg grid">
-        <PageTitle title={'Edit a MAC settings profile'} className="mb-0" />
+        <PageTitle title={m.editMacSettingsProfile} className="mb-0" />
         <div className="item-12">
           <MACSettingsProfileForm
             edit
diff --git a/pkg/webui/lib/shared-messages.js b/pkg/webui/lib/shared-messages.js
index 482b1acdc3..54ed8f6980 100644
--- a/pkg/webui/lib/shared-messages.js
+++ b/pkg/webui/lib/shared-messages.js
@@ -168,6 +168,7 @@ export default defineMessages({
   currentCollaborators: 'Current collaborators',
   currentPassword: 'Current password',
   currentUserIndicator: '(This is you)',
+  createMacSettingsProfile: 'Create a new MAC settings profile',
   dashboard: 'Dashboard',
   data: 'Data',
   dataSheet: 'Data sheet',
diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
index aebfa58234..314605e447 100644
--- a/pkg/webui/locales/en.json
+++ b/pkg/webui/locales/en.json
@@ -179,6 +179,7 @@
   "console.components.lorawan-version-input.index.phyVersionError": "Failed to fetch regional parameters versions",
   "console.components.mac-settings-section.index.noMacSettingsProfiles": "You have no MAC settings profiles yet.",
   "console.components.mac-settings-section.index.noMacSettingsProfilesAction": "You have no MAC settings profiles yet. Create one to be able to assign it here.",
+  "console.components.mac-settings-section.index.macSettingsProfile": "MAC settings profile",
   "console.components.notifications.templates.api-key-changed.title": "API key of {entityType} has been changed",
   "console.components.notifications.templates.api-key-changed.body": "An API key of your {entityType} <code>{id}</code> on your network has been changed.",
   "console.components.notifications.templates.api-key-changed.preview": "An API key of your {entityType} \"{id}\" on your network has been changed. API Key ID: {apiKeyId}",
@@ -699,6 +700,8 @@
   "console.containers.lora-cloud-ms-form.index.modemEncoding": "LoRa Edge Reference Tracker (Modem-E) encoding",
   "console.containers.lora-cloud-ms-form.index.deleteWarning": "Are you sure you want to delete the LoRa Cloud Modem and Geolocation Services token? This action cannot be undone.",
   "console.containers.lora-cloud-ms-form.index.fPortSetValidationFormat": "The FPort must be a number between 1 and 223, or a comma-separated list of numbers between 1 and 223",
+  "console.containers.mac-settings-profile-form.index.updated": "MAC settings profile updated",
+  "console.containers.mac-settings-profile-form.index.created": "MAC settings profile created",
   "console.containers.mac-settings-profiles-table.index.information": "MAC settings profiles are used to set MAC settings of end devices more conveniently.",
   "console.containers.mac-settings-profiles-table.index.deleteSuccess": "MAC settings profile deleted",
   "console.containers.mac-settings-profiles-table.index.deleteFail": "There was an error and the MAC settings profile could not be deleted",
@@ -959,6 +962,7 @@
   "console.views.application-integrations-webhook-add-form.index.addCustomWebhook": "Add custom webhook",
   "console.views.application-integrations-webhook-add-form.index.addWebhookViaTemplate": "Add webhook for {templateName}",
   "console.views.application-integrations-webhook-add-form.index.customWebhook": "Custom webhook",
+  "console.views.application-mac-settings-profile-edit.index.editMacSettingsProfile": "Edit a MAC settings profile",
   "console.views.application-overview.index.failedAccessOtherHostApplication": "The application you attempted to visit is registered on a different cluster and needs to be accessed using its host Console.",
   "console.views.device-general-settings.application-server-form.index.skip": "Enforce skipping payload crypto",
   "console.views.device-general-settings.application-server-form.index.include": "Enforce payload crypto",
@@ -1328,6 +1332,7 @@
   "lib.shared-messages.currentCollaborators": "Current collaborators",
   "lib.shared-messages.currentPassword": "Current password",
   "lib.shared-messages.currentUserIndicator": "(This is you)",
+  "lib.shared-messages.createMacSettingsProfile": "Create a new MAC settings profile",
   "lib.shared-messages.dashboard": "Dashboard",
   "lib.shared-messages.data": "Data",
   "lib.shared-messages.dataSheet": "Data sheet",
diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index 6d3039411e..de25ed0018 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -179,6 +179,7 @@
   "console.components.lorawan-version-input.index.phyVersionError": "",
   "console.components.mac-settings-section.index.noMacSettingsProfiles": "",
   "console.components.mac-settings-section.index.noMacSettingsProfilesAction": "",
+  "console.components.mac-settings-section.index.macSettingsProfile": "",
   "console.components.notifications.templates.api-key-changed.title": "",
   "console.components.notifications.templates.api-key-changed.body": "",
   "console.components.notifications.templates.api-key-changed.preview": "",
@@ -699,6 +700,8 @@
   "console.containers.lora-cloud-ms-form.index.modemEncoding": "",
   "console.containers.lora-cloud-ms-form.index.deleteWarning": "",
   "console.containers.lora-cloud-ms-form.index.fPortSetValidationFormat": "",
+  "console.containers.mac-settings-profile-form.index.updated": "",
+  "console.containers.mac-settings-profile-form.index.created": "",
   "console.containers.mac-settings-profiles-table.index.information": "",
   "console.containers.mac-settings-profiles-table.index.deleteSuccess": "",
   "console.containers.mac-settings-profiles-table.index.deleteFail": "",
@@ -959,6 +962,7 @@
   "console.views.application-integrations-webhook-add-form.index.addCustomWebhook": "",
   "console.views.application-integrations-webhook-add-form.index.addWebhookViaTemplate": "",
   "console.views.application-integrations-webhook-add-form.index.customWebhook": "",
+  "console.views.application-mac-settings-profile-edit.index.editMacSettingsProfile": "",
   "console.views.application-overview.index.failedAccessOtherHostApplication": "",
   "console.views.device-general-settings.application-server-form.index.skip": "",
   "console.views.device-general-settings.application-server-form.index.include": "",
@@ -1328,6 +1332,7 @@
   "lib.shared-messages.currentCollaborators": "現在のコラボレーター",
   "lib.shared-messages.currentPassword": "",
   "lib.shared-messages.currentUserIndicator": "(これはあなたです)",
+  "lib.shared-messages.createMacSettingsProfile": "",
   "lib.shared-messages.dashboard": "",
   "lib.shared-messages.data": "データ",
   "lib.shared-messages.dataSheet": "",

From e8a7c3cca485fbe9feb9c24dc77f7f7566315c63 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 1 Sep 2025 16:07:55 +0200
Subject: [PATCH 06/17] console: Styling fixes

---
 pkg/webui/console/components/mac-settings-section/index.js  | 3 ++-
 .../console/containers/mac-settings-profile-form/index.js   | 3 ++-
 .../console/containers/mac-settings-profiles-table/index.js | 6 ++----
 pkg/webui/locales/en.json                                   | 1 +
 pkg/webui/locales/ja.json                                   | 1 +
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkg/webui/console/components/mac-settings-section/index.js b/pkg/webui/console/components/mac-settings-section/index.js
index 73a2fa52f5..09f6166542 100644
--- a/pkg/webui/console/components/mac-settings-section/index.js
+++ b/pkg/webui/console/components/mac-settings-section/index.js
@@ -255,6 +255,7 @@ const MacSettingsSection = props => {
           icon={IconX}
           message={sharedMessages.remove}
           onClick={handleRemoveMacSettingsProfile}
+          disabled={!hasMacSettingsProfile}
         />
       </Form.FieldContainer>
       {macSettingsProfilesOptions.length === 0 && (
@@ -269,7 +270,7 @@ const MacSettingsSection = props => {
                   replace: true,
                 })
               }
-              message={m.createMacSettingsProfile}
+              message={sharedMessages.createMacSettingsProfile}
               className="mt-cs-m"
               secondary
             />
diff --git a/pkg/webui/console/containers/mac-settings-profile-form/index.js b/pkg/webui/console/containers/mac-settings-profile-form/index.js
index 29d935b339..5d692b48a5 100644
--- a/pkg/webui/console/containers/mac-settings-profile-form/index.js
+++ b/pkg/webui/console/containers/mac-settings-profile-form/index.js
@@ -51,6 +51,7 @@ import { validationSchema, initialValues } from './form-validation'
 const m = defineMessages({
   updated: 'MAC settings profile updated',
   created: 'MAC settings profile created',
+  profileId: 'Profile ID',
 })
 
 // 0...7
@@ -181,7 +182,7 @@ const MACSettingsProfileInnerForm = () => {
   return (
     <>
       <Form.Field
-        title={'Profile ID'}
+        title={m.profileId}
         name="ids.profile_id"
         component={Input}
         required
diff --git a/pkg/webui/console/containers/mac-settings-profiles-table/index.js b/pkg/webui/console/containers/mac-settings-profiles-table/index.js
index 41e59d65d1..2929f10af6 100644
--- a/pkg/webui/console/containers/mac-settings-profiles-table/index.js
+++ b/pkg/webui/console/containers/mac-settings-profiles-table/index.js
@@ -90,7 +90,7 @@ const MacSettingsProfilesTable = props => {
             <span className="c-text-neutral-light d-block">{id}</span>
           </>
         ) : (
-          <span className="mt-0 p-0 fw-bold d-block">{id}</span>
+          <span className="c-text-neutral-bold mt-0 p-0 fw-bold d-block">{id}</span>
         ),
       sortable: true,
       sortKey: 'ids.profile_id',
@@ -112,7 +112,6 @@ const MacSettingsProfilesTable = props => {
             icon={IconPencil}
             onClick={details.edit}
             secondary
-            small
           />
           <DeleteModalButton
             message={sharedMessages.delete}
@@ -120,7 +119,6 @@ const MacSettingsProfilesTable = props => {
             entityName={details.name}
             onApprove={details.delete}
             defaultMessage={m.deleteModalMessage}
-            small
           />
         </ButtonGroup>
       ),
@@ -135,7 +133,7 @@ const MacSettingsProfilesTable = props => {
         entity="mac_settings_profiles"
         defaultOrder="-ids.profile_id"
         headers={headers}
-        addMessage={m.createMacSettingsProfile}
+        addMessage={sharedMessages.createMacSettingsProfile}
         baseDataSelector={baseDataSelector}
         getItemsAction={getItemsAction}
         clickable={false}
diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
index 314605e447..95a51520c3 100644
--- a/pkg/webui/locales/en.json
+++ b/pkg/webui/locales/en.json
@@ -702,6 +702,7 @@
   "console.containers.lora-cloud-ms-form.index.fPortSetValidationFormat": "The FPort must be a number between 1 and 223, or a comma-separated list of numbers between 1 and 223",
   "console.containers.mac-settings-profile-form.index.updated": "MAC settings profile updated",
   "console.containers.mac-settings-profile-form.index.created": "MAC settings profile created",
+  "console.containers.mac-settings-profile-form.index.profileId": "Profile ID",
   "console.containers.mac-settings-profiles-table.index.information": "MAC settings profiles are used to set MAC settings of end devices more conveniently.",
   "console.containers.mac-settings-profiles-table.index.deleteSuccess": "MAC settings profile deleted",
   "console.containers.mac-settings-profiles-table.index.deleteFail": "There was an error and the MAC settings profile could not be deleted",
diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index de25ed0018..898a3f5222 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -702,6 +702,7 @@
   "console.containers.lora-cloud-ms-form.index.fPortSetValidationFormat": "",
   "console.containers.mac-settings-profile-form.index.updated": "",
   "console.containers.mac-settings-profile-form.index.created": "",
+  "console.containers.mac-settings-profile-form.index.profileId": "",
   "console.containers.mac-settings-profiles-table.index.information": "",
   "console.containers.mac-settings-profiles-table.index.deleteSuccess": "",
   "console.containers.mac-settings-profiles-table.index.deleteFail": "",

From f54ce10f98c76a8e9a4e8d8fd40112fac81d91b9 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 1 Sep 2025 16:38:10 +0200
Subject: [PATCH 07/17] console: Fix messages

---
 .../containers/mac-settings-profile-form/index.js |  3 +--
 .../mac-settings-profiles-table/index.js          | 15 +--------------
 pkg/webui/lib/shared-messages.js                  |  1 +
 pkg/webui/locales/en.json                         |  2 +-
 pkg/webui/locales/ja.json                         |  2 +-
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/pkg/webui/console/containers/mac-settings-profile-form/index.js b/pkg/webui/console/containers/mac-settings-profile-form/index.js
index 5d692b48a5..658f2bf0da 100644
--- a/pkg/webui/console/containers/mac-settings-profile-form/index.js
+++ b/pkg/webui/console/containers/mac-settings-profile-form/index.js
@@ -51,7 +51,6 @@ import { validationSchema, initialValues } from './form-validation'
 const m = defineMessages({
   updated: 'MAC settings profile updated',
   created: 'MAC settings profile created',
-  profileId: 'Profile ID',
 })
 
 // 0...7
@@ -182,7 +181,7 @@ const MACSettingsProfileInnerForm = () => {
   return (
     <>
       <Form.Field
-        title={m.profileId}
+        title={sharedMessages.profileId}
         name="ids.profile_id"
         component={Input}
         required
diff --git a/pkg/webui/console/containers/mac-settings-profiles-table/index.js b/pkg/webui/console/containers/mac-settings-profiles-table/index.js
index 2929f10af6..65013ab57c 100644
--- a/pkg/webui/console/containers/mac-settings-profiles-table/index.js
+++ b/pkg/webui/console/containers/mac-settings-profiles-table/index.js
@@ -78,20 +78,7 @@ const MacSettingsProfilesTable = props => {
   const headers = [
     {
       name: 'ids.profile_id',
-      displayName: sharedMessages.nameAndId,
-      getValue: row => ({
-        id: row.ids.profile_id,
-        name: row.name,
-      }),
-      render: ({ name, id }) =>
-        Boolean(name) ? (
-          <>
-            <span className="mt-0 mb-cs-xxs p-0 fw-bold d-block">{name}</span>
-            <span className="c-text-neutral-light d-block">{id}</span>
-          </>
-        ) : (
-          <span className="c-text-neutral-bold mt-0 p-0 fw-bold d-block">{id}</span>
-        ),
+      displayName: sharedMessages.profileId,
       sortable: true,
       sortKey: 'ids.profile_id',
     },
diff --git a/pkg/webui/lib/shared-messages.js b/pkg/webui/lib/shared-messages.js
index 54ed8f6980..6cfeaa6983 100644
--- a/pkg/webui/lib/shared-messages.js
+++ b/pkg/webui/lib/shared-messages.js
@@ -491,6 +491,7 @@ export default defineMessages({
   privacyPolicy: 'Privacy policy',
   profile: 'Profile',
   profileName: 'Profile name',
+  profileId: 'Profile ID',
   profileSettings: 'Profile settings',
   provider: 'Provider',
   provisionedOnExternalJoinServer: 'Provisioned on external Join Server',
diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
index 95a51520c3..5cd3d34697 100644
--- a/pkg/webui/locales/en.json
+++ b/pkg/webui/locales/en.json
@@ -702,7 +702,6 @@
   "console.containers.lora-cloud-ms-form.index.fPortSetValidationFormat": "The FPort must be a number between 1 and 223, or a comma-separated list of numbers between 1 and 223",
   "console.containers.mac-settings-profile-form.index.updated": "MAC settings profile updated",
   "console.containers.mac-settings-profile-form.index.created": "MAC settings profile created",
-  "console.containers.mac-settings-profile-form.index.profileId": "Profile ID",
   "console.containers.mac-settings-profiles-table.index.information": "MAC settings profiles are used to set MAC settings of end devices more conveniently.",
   "console.containers.mac-settings-profiles-table.index.deleteSuccess": "MAC settings profile deleted",
   "console.containers.mac-settings-profiles-table.index.deleteFail": "There was an error and the MAC settings profile could not be deleted",
@@ -1634,6 +1633,7 @@
   "lib.shared-messages.privacyPolicy": "Privacy policy",
   "lib.shared-messages.profile": "Profile",
   "lib.shared-messages.profileName": "Profile name",
+  "lib.shared-messages.profileId": "Profile ID",
   "lib.shared-messages.profileSettings": "Profile settings",
   "lib.shared-messages.provider": "Provider",
   "lib.shared-messages.provisionedOnExternalJoinServer": "Provisioned on external Join Server",
diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index 898a3f5222..f4bfac59ae 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -702,7 +702,6 @@
   "console.containers.lora-cloud-ms-form.index.fPortSetValidationFormat": "",
   "console.containers.mac-settings-profile-form.index.updated": "",
   "console.containers.mac-settings-profile-form.index.created": "",
-  "console.containers.mac-settings-profile-form.index.profileId": "",
   "console.containers.mac-settings-profiles-table.index.information": "",
   "console.containers.mac-settings-profiles-table.index.deleteSuccess": "",
   "console.containers.mac-settings-profiles-table.index.deleteFail": "",
@@ -1634,6 +1633,7 @@
   "lib.shared-messages.privacyPolicy": "個人情報保護方針",
   "lib.shared-messages.profile": "",
   "lib.shared-messages.profileName": "",
+  "lib.shared-messages.profileId": "",
   "lib.shared-messages.profileSettings": "プロファイル設定",
   "lib.shared-messages.provider": "プロバイダー",
   "lib.shared-messages.provisionedOnExternalJoinServer": "外部のJoinサーバーでプロビジョニング",

From 4e25c226bb1120d2564f7f0416a152cfd3bd2bec Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 1 Sep 2025 16:51:37 +0200
Subject: [PATCH 08/17] console: Refactor repetitions

---
 .../components/mac-settings-section/index.js  | 39 ++---------
 .../mac-settings-profile-form/index.js        | 66 ++++---------------
 pkg/webui/console/lib/device-utils.js         | 41 ++++++++++++
 3 files changed, 58 insertions(+), 88 deletions(-)

diff --git a/pkg/webui/console/components/mac-settings-section/index.js b/pkg/webui/console/components/mac-settings-section/index.js
index 09f6166542..3cc591ea5d 100644
--- a/pkg/webui/console/components/mac-settings-section/index.js
+++ b/pkg/webui/console/components/mac-settings-section/index.js
@@ -42,6 +42,10 @@ import {
   fCntWidthEncode,
   fCntWidthDecode,
   parseLorawanMacVersion,
+  maxDutyCycleOptions,
+  pingSlotPeriodicityOptions,
+  adrAckLimitOptions,
+  adrAckDelayOptions,
 } from '@console/lib/device-utils'
 import getDataRate from '@console/lib/data-rate-utils'
 
@@ -55,41 +59,6 @@ const m = defineMessages({
   macSettingsProfile: 'MAC settings profile',
 })
 
-// 0...7
-const pingSlotPeriodicityOptions = Array.from({ length: 8 }, (_, index) => {
-  const value = Math.pow(2, index)
-
-  return {
-    value: `PING_EVERY_${value}S`,
-    label: <Message content={sharedMessages.secondInterval} values={{ count: value }} />,
-  }
-})
-// 0...15
-const adrAckLimitOptions = Array.from({ length: 16 }, (_, index) => {
-  const value = Math.pow(2, index)
-
-  return {
-    value: `ADR_ACK_LIMIT_${value}`,
-    label: <Message content={sharedMessages.adrAckValue} values={{ count: value }} />,
-  }
-})
-// 0...15
-const adrAckDelayOptions = Array.from({ length: 16 }, (_, index) => {
-  const value = Math.pow(2, index)
-
-  return {
-    value: `ADR_ACK_DELAY_${value}`,
-    label: <Message content={sharedMessages.adrAckValue} values={{ count: value }} />,
-  }
-})
-const maxDutyCycleOptions = [
-  { value: 'DUTY_CYCLE_1', label: '100%' },
-  { value: 'DUTY_CYCLE_16', label: '6.25%' },
-  { value: 'DUTY_CYCLE_128', label: '0.781%' },
-  { value: 'DUTY_CYCLE_1024', label: '0.098%' },
-  { value: 'DUTY_CYCLE_16384', label: '0.006%' },
-]
-
 const MacSettingsSection = props => {
   const {
     activationMode,
diff --git a/pkg/webui/console/containers/mac-settings-profile-form/index.js b/pkg/webui/console/containers/mac-settings-profile-form/index.js
index 658f2bf0da..d0e52002d1 100644
--- a/pkg/webui/console/containers/mac-settings-profile-form/index.js
+++ b/pkg/webui/console/containers/mac-settings-profile-form/index.js
@@ -39,7 +39,15 @@ import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 import PropTypes from '@ttn-lw/lib/prop-types'
 import diff from '@ttn-lw/lib/diff'
 
-import { FRAME_WIDTH_COUNT, fCntWidthEncode, fCntWidthDecode } from '@console/lib/device-utils'
+import {
+  FRAME_WIDTH_COUNT,
+  fCntWidthEncode,
+  fCntWidthDecode,
+  maxDutyCycleOptions,
+  pingSlotPeriodicityOptions,
+  adrAckLimitOptions,
+  adrAckDelayOptions,
+} from '@console/lib/device-utils'
 
 import {
   createMacSettingsProfile,
@@ -53,59 +61,11 @@ const m = defineMessages({
   created: 'MAC settings profile created',
 })
 
-// 0...7
-const pingSlotPeriodicityOptions = Array.from({ length: 8 }, (_, index) => {
-  const value = Math.pow(2, index)
-
-  return {
-    value: `PING_EVERY_${value}S`,
-    label: <Message content={sharedMessages.secondInterval} values={{ count: value }} />,
-  }
-})
 // 0...15
-const adrAckLimitOptions = Array.from({ length: 16 }, (_, index) => {
-  const value = Math.pow(2, index)
-
-  return {
-    value: `ADR_ACK_LIMIT_${value}`,
-    label: <Message content={sharedMessages.adrAckValue} values={{ count: value }} />,
-  }
-})
-// 0...15
-const adrAckDelayOptions = Array.from({ length: 16 }, (_, index) => {
-  const value = Math.pow(2, index)
-
-  return {
-    value: `ADR_ACK_DELAY_${value}`,
-    label: <Message content={sharedMessages.adrAckValue} values={{ count: value }} />,
-  }
-})
-const maxDutyCycleOptions = [
-  { value: 'DUTY_CYCLE_1', label: '100%' },
-  { value: 'DUTY_CYCLE_16', label: '6.25%' },
-  { value: 'DUTY_CYCLE_128', label: '0.781%' },
-  { value: 'DUTY_CYCLE_1024', label: '0.098%' },
-  { value: 'DUTY_CYCLE_16384', label: '0.006%' },
-]
-
-const dataRateOverrideOptions = [
-  { value: 'data_rate_0', label: 'Data rate 0' },
-  { value: 'data_rate_1', label: 'Data rate 1' },
-  { value: 'data_rate_2', label: 'Data rate 2' },
-  { value: 'data_rate_3', label: 'Data rate 3' },
-  { value: 'data_rate_4', label: 'Data rate 4' },
-  { value: 'data_rate_5', label: 'Data rate 5' },
-  { value: 'data_rate_6', label: 'Data rate 6' },
-  { value: 'data_rate_7', label: 'Data rate 7' },
-  { value: 'data_rate_8', label: 'Data rate 8' },
-  { value: 'data_rate_9', label: 'Data rate 9' },
-  { value: 'data_rate_10', label: 'Data rate 10' },
-  { value: 'data_rate_11', label: 'Data rate 11' },
-  { value: 'data_rate_12', label: 'Data rate 12' },
-  { value: 'data_rate_13', label: 'Data rate 13' },
-  { value: 'data_rate_14', label: 'Data rate 14' },
-  { value: 'data_rate_15', label: 'Data rate 15' },
-]
+const dataRateOverrideOptions = Array.from({ length: 16 }, (_, index) => ({
+  value: `data_rate${index}`,
+  label: <Message content={sharedMessages.dataRate} values={{ n: index }} />,
+}))
 
 const MACSettingsProfileInnerForm = () => {
   const { values, setFieldValue, setFieldTouched } = useFormContext()
diff --git a/pkg/webui/console/lib/device-utils.js b/pkg/webui/console/lib/device-utils.js
index 0d4a606c7d..c9838b07c5 100644
--- a/pkg/webui/console/lib/device-utils.js
+++ b/pkg/webui/console/lib/device-utils.js
@@ -12,6 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import React from 'react'
+
+import Message from '@ttn-lw/lib/components/message'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
 import randomByteString from '@console/lib/random-bytes'
 
 export const ACTIVATION_MODES = Object.freeze({
@@ -250,3 +256,38 @@ export const lorawanVersionValueSetter = ({ setValues, setFieldTouched }, { valu
     lorawan_phy_version: phyVersions.length === 1 ? phyVersions[0].value : '',
   }))
 }
+
+// 0...7
+export const pingSlotPeriodicityOptions = Array.from({ length: 8 }, (_, index) => {
+  const value = Math.pow(2, index)
+
+  return {
+    value: `PING_EVERY_${value}S`,
+    label: <Message content={sharedMessages.secondInterval} values={{ count: value }} />,
+  }
+})
+// 0...15
+export const adrAckLimitOptions = Array.from({ length: 16 }, (_, index) => {
+  const value = Math.pow(2, index)
+
+  return {
+    value: `ADR_ACK_LIMIT_${value}`,
+    label: <Message content={sharedMessages.adrAckValue} values={{ count: value }} />,
+  }
+})
+// 0...15
+export const adrAckDelayOptions = Array.from({ length: 16 }, (_, index) => {
+  const value = Math.pow(2, index)
+
+  return {
+    value: `ADR_ACK_DELAY_${value}`,
+    label: <Message content={sharedMessages.adrAckValue} values={{ count: value }} />,
+  }
+})
+export const maxDutyCycleOptions = [
+  { value: 'DUTY_CYCLE_1', label: '100%' },
+  { value: 'DUTY_CYCLE_16', label: '6.25%' },
+  { value: 'DUTY_CYCLE_128', label: '0.781%' },
+  { value: 'DUTY_CYCLE_1024', label: '0.098%' },
+  { value: 'DUTY_CYCLE_16384', label: '0.006%' },
+]

From 595eace0d27a53a8247a75f4d8f34231d60c4548 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Tue, 2 Sep 2025 16:11:43 +0200
Subject: [PATCH 09/17] console: Add go back to device after creation

---
 .../components/mac-settings-section/index.js  |  4 ++-
 .../mac-settings-profile-form/index.js        | 27 +++++++++++++++----
 .../network-server-form/index.js              |  1 +
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/pkg/webui/console/components/mac-settings-section/index.js b/pkg/webui/console/components/mac-settings-section/index.js
index 3cc591ea5d..f0cf7727b7 100644
--- a/pkg/webui/console/components/mac-settings-section/index.js
+++ b/pkg/webui/console/components/mac-settings-section/index.js
@@ -69,6 +69,7 @@ const MacSettingsSection = props => {
     isClassC,
     bandId,
     appId,
+    deviceId,
   } = props
 
   const navigate = useNavigate()
@@ -236,7 +237,7 @@ const MacSettingsSection = props => {
               icon={IconPlus}
               onClick={() =>
                 navigate(`/applications/${appId}/mac-settings-profiles/add`, {
-                  replace: true,
+                  state: { deviceId },
                 })
               }
               message={sharedMessages.createMacSettingsProfile}
@@ -752,6 +753,7 @@ MacSettingsSection.propTypes = {
   activationMode: PropTypes.oneOf(Object.values(ACTIVATION_MODES)).isRequired,
   appId: PropTypes.string.isRequired,
   bandId: PropTypes.string.isRequired,
+  deviceId: PropTypes.string.isRequired,
   initiallyCollapsed: PropTypes.bool,
   isClassB: PropTypes.bool,
   isClassC: PropTypes.bool,
diff --git a/pkg/webui/console/containers/mac-settings-profile-form/index.js b/pkg/webui/console/containers/mac-settings-profile-form/index.js
index d0e52002d1..d2c9481d06 100644
--- a/pkg/webui/console/containers/mac-settings-profile-form/index.js
+++ b/pkg/webui/console/containers/mac-settings-profile-form/index.js
@@ -15,7 +15,7 @@
 import React, { useCallback, useMemo, useState } from 'react'
 import { get, set, isEmpty, omitBy } from 'lodash'
 import { useDispatch } from 'react-redux'
-import { useNavigate, useParams } from 'react-router-dom'
+import { useLocation, useNavigate, useParams } from 'react-router-dom'
 import { defineMessages } from 'react-intl'
 
 import Form, { useFormContext } from '@ttn-lw/components/form'
@@ -67,7 +67,7 @@ const dataRateOverrideOptions = Array.from({ length: 16 }, (_, index) => ({
   label: <Message content={sharedMessages.dataRate} values={{ n: index }} />,
 }))
 
-const MACSettingsProfileInnerForm = () => {
+const MACSettingsProfileInnerForm = ({ edit }) => {
   const { values, setFieldValue, setFieldTouched } = useFormContext()
   const { mac_settings } = values
   const [resetsFCnt, setResetsFCnt] = useState(false)
@@ -146,6 +146,7 @@ const MACSettingsProfileInnerForm = () => {
         component={Input}
         required
         fieldWidth="half"
+        disabled={edit}
       />
       <Form.Field
         title={sharedMessages.frameCounterWidth}
@@ -489,6 +490,7 @@ const MACSettingsProfileInnerForm = () => {
                         component={Select}
                         options={dataRateOverrideOptions}
                         className="d-flex direction-column flex-grow"
+                        fieldWidth="quarter"
                       />
                       <Form.Field
                         title={sharedMessages.minNbTrans}
@@ -579,9 +581,18 @@ const MACSettingsProfileInnerForm = () => {
   )
 }
 
+MACSettingsProfileInnerForm.propTypes = {
+  edit: PropTypes.bool,
+}
+
+MACSettingsProfileInnerForm.defaultProps = {
+  edit: false,
+}
+
 const MACSettingsProfileForm = ({ edit, macSettingsProfile, macSettingsProfileId }) => {
   const dispatch = useDispatch()
   const { appId } = useParams()
+  const { state } = useLocation()
   const navigate = useNavigate()
   const [error, setError] = useState('')
 
@@ -632,13 +643,19 @@ const MACSettingsProfileForm = ({ edit, macSettingsProfile, macSettingsProfileId
           message: m.created,
           type: toast.types.SUCCESS,
         })
-        navigate(`/applications/${appId}/mac-settings-profiles`)
+        if (state?.deviceId) {
+          navigate(`/applications/${appId}/devices/${state.deviceId}/general-settings`, {
+            preventScrollReset: true,
+          })
+        } else {
+          navigate(`/applications/${appId}/mac-settings-profiles`)
+        }
       } catch (error) {
         setSubmitting(false)
         setError(error)
       }
     },
-    [appId, dispatch, navigate],
+    [appId, dispatch, navigate, state],
   )
 
   const handleEdit = useCallback(
@@ -680,7 +697,7 @@ const MACSettingsProfileForm = ({ edit, macSettingsProfile, macSettingsProfileId
       onSubmit={edit ? handleEdit : handleSubmit}
       error={error}
     >
-      <MACSettingsProfileInnerForm />
+      <MACSettingsProfileInnerForm edit={edit} />
       <SubmitBar>
         <Form.Submit
           component={SubmitButton}
diff --git a/pkg/webui/console/views/device-general-settings/network-server-form/index.js b/pkg/webui/console/views/device-general-settings/network-server-form/index.js
index b9b39623b7..2e0ab41b52 100644
--- a/pkg/webui/console/views/device-general-settings/network-server-form/index.js
+++ b/pkg/webui/console/views/device-general-settings/network-server-form/index.js
@@ -613,6 +613,7 @@ const NetworkServerForm = React.memo(props => {
         isClassC={isClassC}
         bandId={bandId}
         appId={appId}
+        deviceId={devId}
       />
       <SubmitBar>
         <Form.Submit component={SubmitButton} message={sharedMessages.saveChanges} />

From fafabb19d98c55e9f63b5f28ed45c860e130c81f Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Tue, 2 Sep 2025 16:11:52 +0200
Subject: [PATCH 10/17] console: Add e2e tests

---
 .../mac-settings-profiles/assign.spec.js      | 205 ++++++++++++++++++
 .../mac-settings-profiles/create.spec.js      | 153 +++++++++++++
 .../mac-settings-profiles/edit.spec.js        | 111 ++++++++++
 .../mac-settings-profiles/list.spec.js        | 122 +++++++++++
 cypress/support/commands.js                   |  14 ++
 5 files changed, 605 insertions(+)
 create mode 100644 cypress/e2e/console/devices/mac-settings-profiles/assign.spec.js
 create mode 100644 cypress/e2e/console/devices/mac-settings-profiles/create.spec.js
 create mode 100644 cypress/e2e/console/devices/mac-settings-profiles/edit.spec.js
 create mode 100644 cypress/e2e/console/devices/mac-settings-profiles/list.spec.js

diff --git a/cypress/e2e/console/devices/mac-settings-profiles/assign.spec.js b/cypress/e2e/console/devices/mac-settings-profiles/assign.spec.js
new file mode 100644
index 0000000000..f974903187
--- /dev/null
+++ b/cypress/e2e/console/devices/mac-settings-profiles/assign.spec.js
@@ -0,0 +1,205 @@
+// Copyright © 2025 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+describe('Device MAC settings profile assignment', () => {
+  const userId = 'device-mac-profile-test-user'
+  const user = {
+    ids: { user_id: userId },
+    primary_email_address: 'device-mac-profile-test-user@example.com',
+    password: 'ABCDefg123!',
+    password_confirm: 'ABCDefg123!',
+  }
+
+  const applicationId = 'app-device-mac-profile-test'
+  const application = {
+    ids: { application_id: applicationId },
+    name: 'Application for device MAC profile test',
+  }
+
+  const macSettingsProfiles = [
+    {
+      ids: {
+        application_ids: { application_id: applicationId },
+        profile_id: 'compatible-profile',
+      },
+      mac_settings: {
+        supports_32_bit_f_cnt: true,
+        rx1_delay: 1,
+      },
+    },
+    {
+      ids: {
+        application_ids: { application_id: applicationId },
+        profile_id: 'another-profile',
+      },
+      mac_settings: {
+        supports_32_bit_f_cnt: false,
+        rx1_delay: 5,
+      },
+    },
+  ]
+
+  const ns = {
+    end_device: {
+      frequency_plan_id: 'EU_863_870_TTN',
+      lorawan_phy_version: 'PHY_V1_0_2_REV_B',
+      multicast: false,
+      supports_join: false,
+      lorawan_version: 'MAC_V1_0_2',
+      session: {
+        keys: {
+          f_nwk_s_int_key: {
+            key: 'CBFBF585D81A9063A31EA6922EDD6360',
+          },
+        },
+        dev_addr: '270000FC',
+      },
+      supports_class_c: false,
+      supports_class_b: false,
+      mac_settings: {
+        rx2_data_rate_index: 0,
+        rx2_frequency: 869525000,
+        rx1_delay: 1,
+        rx1_data_rate_offset: 0,
+        resets_f_cnt: false,
+      },
+    },
+  }
+
+  let endDeviceId
+
+  before(() => {
+    cy.dropAndSeedDatabase()
+    cy.createUser(user)
+    cy.createApplication(application, userId)
+    cy.createMockDeviceAllComponents(applicationId, undefined, { ns }).then(body => {
+      endDeviceId = body.end_device.ids.device_id
+    })
+    macSettingsProfiles.forEach(profile => cy.createMacSettingsProfile(applicationId, profile))
+  })
+
+  beforeEach(() => {
+    cy.loginConsole({ user_id: user.ids.user_id, password: user.password })
+    cy.visit(
+      `${Cypress.config('consoleRootPath')}/applications/${applicationId}/devices/${endDeviceId}/general-settings`,
+    )
+  })
+
+  it('displays MAC settings profile selection in device edit form', () => {
+    cy.get('button[type="submit"]').scrollIntoView()
+    cy.findByText('Network layer')
+      .should('be.visible')
+      .closest('[data-test-id="collapsible-section"]')
+      .within(() => {
+        cy.findByRole('button', { name: 'Expand' }).click()
+        cy.get('button[type="submit"]').scrollIntoView()
+        cy.findByLabelText('MAC settings profile').should('be.visible')
+        cy.findByRole('button', { name: /Remove/ }).should('be.disabled')
+      })
+  })
+
+  it('succeeds to assign MAC settings profile to existing device', () => {
+    cy.get('button[type="submit"]').scrollIntoView()
+    cy.findByText('Network layer')
+      .should('be.visible')
+      .closest('[data-test-id="collapsible-section"]')
+      .within(() => {
+        cy.findByRole('button', { name: 'Expand' }).click()
+        cy.get('button[type="submit"]').scrollIntoView()
+        cy.findByLabelText('MAC settings profile').selectOption('compatible-profile')
+        cy.findByRole('button', { name: /Remove/ }).should('not.be.disabled')
+        cy.findByRole('button', { name: /Save changes/ }).click()
+      })
+
+    cy.findByTestId('toast-notification-success')
+      .should('be.visible')
+      .and('contain', 'End device updated')
+  })
+
+  it('succeeds to remove MAC settings profile from device', () => {
+    cy.get('button[type="submit"]').scrollIntoView()
+    cy.findByText('Network layer')
+      .should('be.visible')
+      .closest('[data-test-id="collapsible-section"]')
+      .within(() => {
+        cy.findByRole('button', { name: 'Expand' }).click()
+        cy.get('button[type="submit"]').scrollIntoView()
+        cy.findByLabelText('MAC settings profile').selectOption('compatible-profile')
+        cy.findByRole('button', { name: /Remove/ }).click()
+        cy.findByLabelText('MAC settings profile').should('have.value', '')
+        cy.findByRole('button', { name: /Save changes/ }).click()
+      })
+
+    cy.findByTestId('toast-notification-success')
+      .should('be.visible')
+      .and('contain', 'End device updated')
+  })
+
+  it('shows custom MAC settings when no profile is selected', () => {
+    cy.get('button[type="submit"]').scrollIntoView()
+    cy.findByText('Network layer')
+      .should('be.visible')
+      .closest('[data-test-id="collapsible-section"]')
+      .within(() => {
+        cy.findByRole('button', { name: 'Expand' }).click()
+        cy.get('button[type="submit"]').scrollIntoView()
+        cy.findByLabelText('MAC settings profile').should('have.value', '')
+        cy.findByRole('button', { name: /Remove/ }).should('be.disabled')
+        cy.findByText('Custom MAC settings').click()
+        cy.get('#mac-settings').scrollIntoView()
+        cy.findByText('Frame counter width').should('be.visible')
+      })
+  })
+
+  it('hides custom MAC settings when profile is selected', () => {
+    cy.get('button[type="submit"]').scrollIntoView()
+    cy.findByText('Network layer')
+      .should('be.visible')
+      .closest('[data-test-id="collapsible-section"]')
+      .within(() => {
+        cy.findByRole('button', { name: 'Expand' }).click()
+        cy.get('button[type="submit"]').scrollIntoView()
+        cy.findByLabelText('MAC settings profile').selectOption('compatible-profile')
+        cy.findByText('Custom MAC settings').should('not.exist')
+      })
+  })
+
+  it('navigates to create MAC settings profile when clicking create button', () => {
+    // Mock empty profiles to show the create button
+    cy.intercept('GET', `/api/v3/ns/applications/${applicationId}/mac_settings_profiles*`, {
+      statusCode: 200,
+      body: {
+        mac_settings_profiles: [],
+      },
+    }).as('getEmptyProfiles')
+
+    cy.reload()
+    cy.wait('@getEmptyProfiles')
+
+    cy.get('button[type="submit"]').scrollIntoView()
+    cy.findByText('Network layer')
+      .should('be.visible')
+      .closest('[data-test-id="collapsible-section"]')
+      .within(() => {
+        cy.findByRole('button', { name: 'Expand' }).click()
+        cy.get('button[type="submit"]').scrollIntoView()
+        cy.findByRole('button', { name: /Create a new MAC settings profile/ }).click()
+      })
+
+    cy.location('pathname').should(
+      'eq',
+      `${Cypress.config('consoleRootPath')}/applications/${applicationId}/mac-settings-profiles/add`,
+    )
+  })
+})
diff --git a/cypress/e2e/console/devices/mac-settings-profiles/create.spec.js b/cypress/e2e/console/devices/mac-settings-profiles/create.spec.js
new file mode 100644
index 0000000000..a70e778dc1
--- /dev/null
+++ b/cypress/e2e/console/devices/mac-settings-profiles/create.spec.js
@@ -0,0 +1,153 @@
+// Copyright © 2025 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+describe('MAC settings profile creation', () => {
+  const userId = 'mac-settings-prof-create-test-user'
+  const user = {
+    ids: { user_id: userId },
+    primary_email_address: 'mac-settings-profile-create-test-user@example.com',
+    password: 'ABCDefg123!',
+    password_confirm: 'ABCDefg123!',
+  }
+
+  const applicationId = 'app-mac-settings-prof-create-test'
+  const application = {
+    ids: { application_id: applicationId },
+    name: 'Application for MAC settings profile creation test',
+  }
+
+  before(() => {
+    cy.dropAndSeedDatabase()
+    cy.createUser(user)
+    cy.createApplication(application, userId)
+  })
+
+  beforeEach(() => {
+    cy.loginConsole({ user_id: user.ids.user_id, password: user.password })
+
+    cy.visit(
+      `${Cypress.config('consoleRootPath')}/applications/${applicationId}/mac-settings-profiles/add`,
+    )
+  })
+
+  it('displays MAC settings profile creation form', () => {
+    cy.findByText('Create a new MAC settings profile', { selector: 'h1' }).should('be.visible')
+    cy.findByLabelText('Profile ID').should('be.visible')
+    cy.findByText('Frame counter width').should('be.visible')
+    cy.findByLabelText('32 bit').should('be.checked')
+    cy.findByLabelText('Rx1 delay').should('be.visible')
+    cy.findByLabelText('Desired Rx1 delay').should('be.visible')
+    cy.findByLabelText('Rx1 data rate offset').should('be.visible')
+    cy.findByLabelText('Desired Rx1 data rate offset').should('be.visible')
+    cy.findByLabelText('Rx2 data rate index').should('be.visible')
+    cy.findByLabelText('Desired Rx2 data rate index').should('be.visible')
+    cy.findByLabelText('Rx2 frequency').should('be.visible')
+    cy.findByLabelText('Desired Rx2 frequency').should('be.visible')
+    cy.findByLabelText('Maximum duty cycle').should('be.visible')
+    cy.findByLabelText('Desired maximum duty cycle').should('be.visible')
+    cy.findByText('Factory preset frequencies').should('be.visible')
+    cy.findByText('Class C timeout').should('be.visible')
+    cy.get('input[name="mac_settings.beacon_frequency"]').scrollIntoView()
+    cy.findByLabelText('Ping slot periodicity').should('be.visible')
+    cy.findByLabelText('Beacon frequency').should('be.visible')
+    cy.findByLabelText('Desired beacon frequency').should('be.visible')
+    cy.findByLabelText('Ping slot frequency').should('be.visible')
+    cy.findByLabelText('Desired ping slot frequency').should('be.visible')
+    cy.findByLabelText('Ping slot data rate index').should('be.visible')
+    cy.findByLabelText('Desired ping slot data rate').should('be.visible')
+    cy.findByLabelText('Status count periodicity').should('be.visible')
+    cy.findByLabelText('Status time periodicity').should('be.visible')
+    cy.findByText('Adaptive data rate (ADR)').should('be.visible')
+  })
+
+  it('validates required fields', () => {
+    cy.findByRole('button', { name: /Create a new MAC settings profile/ }).click()
+    cy.findErrorByLabelText('Profile ID')
+      .should('contain.text', 'Profile ID is required')
+      .and('be.visible')
+  })
+
+  it('succeeds to create basic MAC settings profile', () => {
+    const profileData = {
+      profile_id: 'basic-test-profile',
+      rx1_delay: '2',
+      rx2_data_rate_index: '3',
+    }
+
+    cy.findByLabelText('Profile ID').type(profileData.profile_id)
+    // eslint-disable-next-line cypress/unsafe-to-chain-command
+    cy.findByLabelText('Rx1 delay').clear().type(profileData.rx1_delay)
+    // eslint-disable-next-line cypress/unsafe-to-chain-command
+    cy.findByLabelText('Rx2 data rate index').clear().type(profileData.rx2_data_rate_index)
+
+    cy.findByRole('button', { name: /Create a new MAC settings profile/ }).click()
+
+    cy.findByTestId('toast-notification-success')
+      .should('be.visible')
+      .and('contain', 'MAC settings profile created')
+
+    cy.location('pathname').should(
+      'eq',
+      `${Cypress.config('consoleRootPath')}/applications/${applicationId}/mac-settings-profiles`,
+    )
+  })
+
+  it('succeeds to create MAC settings profile with ADR dynamic settings', () => {
+    const profileData = {
+      profile_id: 'adr-dynamic-profile',
+      adr_margin: '10',
+      min_nb_trans: '1',
+      max_nb_trans: '3',
+    }
+
+    cy.findByLabelText('Profile ID').type(profileData.profile_id)
+
+    cy.findByLabelText('ADR margin').type(profileData.adr_margin)
+
+    cy.findByLabelText('Use default settings for number of retransmissions').uncheck()
+    cy.findByLabelText('Override server defaults for NbTrans (all data rates)').check()
+
+    cy.findByLabelText('Min. NbTrans').type(profileData.min_nb_trans)
+    cy.findByLabelText('Max. NbTrans').type(profileData.max_nb_trans)
+
+    cy.findByRole('button', { name: /Create a new MAC settings profile/ }).click()
+
+    cy.findByTestId('toast-notification-success')
+      .should('be.visible')
+      .and('contain', 'MAC settings profile created')
+  })
+
+  it('succeeds to create MAC settings profile with static ADR settings', () => {
+    const profileData = {
+      profile_id: 'adr-static-profile',
+      data_rate_index: '5',
+      tx_power_index: '2',
+      nb_trans: '2',
+    }
+
+    cy.findByLabelText('Profile ID').type(profileData.profile_id)
+
+    // Select static ADR
+    cy.findByLabelText('Static mode').check()
+    cy.findByLabelText('ADR data rate index').type(profileData.data_rate_index)
+    cy.findByLabelText('ADR transmission power index').type(profileData.tx_power_index)
+    cy.findByLabelText('ADR number of transmissions').type(profileData.nb_trans)
+
+    cy.findByRole('button', { name: /Create a new MAC settings profile/ }).click()
+
+    cy.findByTestId('toast-notification-success')
+      .should('be.visible')
+      .and('contain', 'MAC settings profile created')
+  })
+})
diff --git a/cypress/e2e/console/devices/mac-settings-profiles/edit.spec.js b/cypress/e2e/console/devices/mac-settings-profiles/edit.spec.js
new file mode 100644
index 0000000000..be43eb65a5
--- /dev/null
+++ b/cypress/e2e/console/devices/mac-settings-profiles/edit.spec.js
@@ -0,0 +1,111 @@
+// Copyright © 2025 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+describe('MAC settings profile edit', () => {
+  const userId = 'mac-settings-profile-edit-test-user'
+  const user = {
+    ids: { user_id: userId },
+    primary_email_address: 'mac-settings-profile-edit-test-user@example.com',
+    password: 'ABCDefg123!',
+    password_confirm: 'ABCDefg123!',
+  }
+
+  const applicationId = 'app-mac-settings-profile-edit-test'
+  const application = {
+    ids: { application_id: applicationId },
+    name: 'Application for MAC settings profile edit test',
+  }
+
+  const profileId = 'edit-test-profile'
+  const macSettingsProfile = {
+    ids: {
+      application_ids: { application_id: applicationId },
+      profile_id: profileId,
+    },
+    mac_settings: {
+      supports_32_bit_f_cnt: true,
+      rx1_delay: 1,
+      rx2_data_rate_index: 0,
+      adr: {
+        dynamic: {
+          margin: 10,
+          min_nb_trans: 1,
+          max_nb_trans: 3,
+        },
+      },
+    },
+  }
+
+  before(() => {
+    cy.dropAndSeedDatabase()
+    cy.createUser(user)
+    cy.createApplication(application, userId)
+    cy.createMacSettingsProfile(applicationId, macSettingsProfile)
+  })
+
+  beforeEach(() => {
+    cy.loginConsole({ user_id: user.ids.user_id, password: user.password })
+
+    cy.visit(
+      `${Cypress.config('consoleRootPath')}/applications/${applicationId}/mac-settings-profiles/${profileId}`,
+    )
+  })
+
+  it('displays MAC settings profile edit form with existing values', () => {
+    cy.findByText('Edit a MAC settings profile', { selector: 'h1' }).should('be.visible')
+    cy.findByLabelText('Profile ID').should('be.disabled').and('have.value', profileId)
+    cy.findByLabelText('Rx1 delay').should('have.value', '1')
+    cy.findByLabelText('Rx2 data rate index').should('have.value', '0')
+    cy.findByLabelText('Dynamic mode').should('be.checked')
+    cy.findByLabelText('ADR margin').should('have.value', '10')
+  })
+
+  it('succeeds to update MAC settings profile', () => {
+    // eslint-disable-next-line cypress/unsafe-to-chain-command
+    cy.findByLabelText('Rx1 delay').clear().type('3')
+    // eslint-disable-next-line cypress/unsafe-to-chain-command
+    cy.findByLabelText('Rx2 data rate index').clear().type('5')
+    // eslint-disable-next-line cypress/unsafe-to-chain-command
+    cy.findByLabelText('ADR margin').clear().type('15')
+
+    cy.findByRole('button', { name: /Save changes/ }).click()
+
+    cy.findByTestId('toast-notification-success')
+      .should('be.visible')
+      .and('contain', 'MAC settings profile updated')
+  })
+
+  it('succeeds to change ADR mode from dynamic to static', () => {
+    cy.findByLabelText('Static mode').check()
+    cy.findByLabelText('ADR data rate index').type('3')
+    cy.findByLabelText('ADR transmission power index').type('1')
+    cy.findByLabelText('ADR number of transmissions').type('2')
+
+    cy.findByRole('button', { name: /Save changes/ }).click()
+
+    cy.findByTestId('toast-notification-success')
+      .should('be.visible')
+      .and('contain', 'MAC settings profile updated')
+  })
+
+  it('succeeds to disable ADR', () => {
+    cy.findByLabelText('Disabled').check()
+
+    cy.findByRole('button', { name: /Save changes/ }).click()
+
+    cy.findByTestId('toast-notification-success')
+      .should('be.visible')
+      .and('contain', 'MAC settings profile updated')
+  })
+})
diff --git a/cypress/e2e/console/devices/mac-settings-profiles/list.spec.js b/cypress/e2e/console/devices/mac-settings-profiles/list.spec.js
new file mode 100644
index 0000000000..245ea01f80
--- /dev/null
+++ b/cypress/e2e/console/devices/mac-settings-profiles/list.spec.js
@@ -0,0 +1,122 @@
+// Copyright © 2025 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+describe('MAC settings profiles list', () => {
+  const userId = 'mac-settings-profiles-test-user'
+  const user = {
+    ids: { user_id: userId },
+    primary_email_address: 'mac-settings-profiles-test-user@example.com',
+    password: 'ABCDefg123!',
+    password_confirm: 'ABCDefg123!',
+  }
+
+  const applicationId = 'app-mac-settings-profiles-test'
+  const application = {
+    ids: { application_id: applicationId },
+    name: 'Application for MAC settings profiles test',
+  }
+
+  const macSettingsProfiles = [
+    {
+      ids: {
+        application_ids: { application_id: applicationId },
+        profile_id: 'test-profile-1',
+      },
+      mac_settings: {
+        supports_32_bit_f_cnt: true,
+        rx1_delay: 1,
+      },
+    },
+    {
+      ids: {
+        application_ids: { application_id: applicationId },
+        profile_id: 'test-profile-2',
+      },
+      mac_settings: {
+        supports_32_bit_f_cnt: false,
+        rx1_delay: 5,
+      },
+    },
+  ]
+
+  before(() => {
+    cy.dropAndSeedDatabase()
+    cy.createUser(user)
+    cy.createApplication(application, userId)
+    macSettingsProfiles.forEach(profile => cy.createMacSettingsProfile(applicationId, profile))
+  })
+
+  beforeEach(() => {
+    cy.loginConsole({ user_id: user.ids.user_id, password: user.password })
+    cy.visit(
+      `${Cypress.config('consoleRootPath')}/applications/${applicationId}/mac-settings-profiles`,
+    )
+  })
+
+  it('displays MAC settings profiles list', () => {
+    cy.findByText('MAC settings profiles', { selector: 'h1' }).should('be.visible')
+    cy.findByText(
+      'MAC settings profiles are used to set MAC settings of end devices more conveniently.',
+    ).should('be.visible')
+
+    cy.findByText('Profile ID').should('be.visible')
+    cy.findByText('Actions').should('be.visible')
+
+    cy.findByText('test-profile-1').should('be.visible')
+    cy.findByText('test-profile-2').should('be.visible')
+  })
+
+  it('succeeds to navigate to create MAC settings profile', () => {
+    cy.findByRole('link', { name: /Create a new MAC settings profile/ }).click()
+    cy.location('pathname').should(
+      'eq',
+      `${Cypress.config('consoleRootPath')}/applications/${applicationId}/mac-settings-profiles/add`,
+    )
+  })
+
+  it('succeeds to edit MAC settings profile', () => {
+    cy.findByRole('row', { name: /test-profile-1/ })
+      .should('be.visible')
+      .within(() => {
+        cy.findByRole('button', { name: /Edit/ }).click()
+      })
+
+    cy.location('pathname').should(
+      'eq',
+      `${Cypress.config('consoleRootPath')}/applications/${applicationId}/mac-settings-profiles/test-profile-1`,
+    )
+  })
+
+  it('succeeds to delete MAC settings profile', () => {
+    cy.findByRole('row', { name: /test-profile-1/ })
+      .should('be.visible')
+      .within(() => {
+        cy.findByRole('button', { name: /Delete/ }).click()
+      })
+
+    cy.findByTestId('modal-window')
+      .should('be.visible')
+      .within(() => {
+        cy.findByText('Confirm deletion').should('be.visible')
+        cy.findByText('The profile will not be applicable to end devices anymore.').should(
+          'be.visible',
+        )
+        cy.findByRole('button', { name: /Delete/ }).click()
+      })
+
+    cy.findByTestId('toast-notification-success')
+      .should('be.visible')
+      .and('contain', 'MAC settings profile deleted')
+  })
+})
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 00a3422584..0e1cf7b7fd 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -442,6 +442,20 @@ Cypress.Commands.add('updateGateway', (gatewayId, gateway) => {
   })
 })
 
+// Helper function to create a new application mac settings profile programmatically.
+Cypress.Commands.add('createMacSettingsProfile', (applicationId, profile) => {
+  const baseUrl = Cypress.config('baseUrl')
+  const adminApiKey = Cypress.config('adminApiKey')
+  cy.request({
+    method: 'POST',
+    url: `${baseUrl}/api/v3/ns/applications/${applicationId}/mac_settings_profiles`,
+    body: { mac_settings_profile: profile },
+    headers: {
+      Authorization: `Bearer ${adminApiKey}`,
+    },
+  })
+})
+
 // Overwrite the default `type` to make sure that subject is resolved and focused before simulating typing. This is helpful
 // when:
 // 1. The action is forced via the `forced` option for inputs that are visually hidden for styling purposes.

From bd4fa68d17e91674eae3df9b7b9eacf425bf6711 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 8 Sep 2025 11:04:08 +0200
Subject: [PATCH 11/17] console: Remove options from device utils

---
 .../components/mac-settings-section/index.js  |  6 ++-
 .../mac-settings-profile-form/index.js        |  6 +--
 pkg/webui/console/lib/device-utils.js         | 41 --------------
 pkg/webui/console/lib/mac-settings-utils.js   | 54 +++++++++++++++++++
 4 files changed, 60 insertions(+), 47 deletions(-)
 create mode 100644 pkg/webui/console/lib/mac-settings-utils.js

diff --git a/pkg/webui/console/components/mac-settings-section/index.js b/pkg/webui/console/components/mac-settings-section/index.js
index f0cf7727b7..fca3821b9e 100644
--- a/pkg/webui/console/components/mac-settings-section/index.js
+++ b/pkg/webui/console/components/mac-settings-section/index.js
@@ -42,12 +42,14 @@ import {
   fCntWidthEncode,
   fCntWidthDecode,
   parseLorawanMacVersion,
+} from '@console/lib/device-utils'
+import getDataRate from '@console/lib/data-rate-utils'
+import {
   maxDutyCycleOptions,
   pingSlotPeriodicityOptions,
   adrAckLimitOptions,
   adrAckDelayOptions,
-} from '@console/lib/device-utils'
-import getDataRate from '@console/lib/data-rate-utils'
+} from '@console/lib/mac-settings-utils'
 
 import { selectDataRates } from '@console/store/selectors/configuration'
 import { selectMacSettingsProfiles } from '@console/store/selectors/mac-settings-profiles'
diff --git a/pkg/webui/console/containers/mac-settings-profile-form/index.js b/pkg/webui/console/containers/mac-settings-profile-form/index.js
index d2c9481d06..820fa8d5d4 100644
--- a/pkg/webui/console/containers/mac-settings-profile-form/index.js
+++ b/pkg/webui/console/containers/mac-settings-profile-form/index.js
@@ -39,15 +39,13 @@ import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 import PropTypes from '@ttn-lw/lib/prop-types'
 import diff from '@ttn-lw/lib/diff'
 
+import { FRAME_WIDTH_COUNT, fCntWidthEncode, fCntWidthDecode } from '@console/lib/device-utils'
 import {
-  FRAME_WIDTH_COUNT,
-  fCntWidthEncode,
-  fCntWidthDecode,
   maxDutyCycleOptions,
   pingSlotPeriodicityOptions,
   adrAckLimitOptions,
   adrAckDelayOptions,
-} from '@console/lib/device-utils'
+} from '@console/lib/mac-settings-utils'
 
 import {
   createMacSettingsProfile,
diff --git a/pkg/webui/console/lib/device-utils.js b/pkg/webui/console/lib/device-utils.js
index c9838b07c5..0d4a606c7d 100644
--- a/pkg/webui/console/lib/device-utils.js
+++ b/pkg/webui/console/lib/device-utils.js
@@ -12,12 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React from 'react'
-
-import Message from '@ttn-lw/lib/components/message'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-
 import randomByteString from '@console/lib/random-bytes'
 
 export const ACTIVATION_MODES = Object.freeze({
@@ -256,38 +250,3 @@ export const lorawanVersionValueSetter = ({ setValues, setFieldTouched }, { valu
     lorawan_phy_version: phyVersions.length === 1 ? phyVersions[0].value : '',
   }))
 }
-
-// 0...7
-export const pingSlotPeriodicityOptions = Array.from({ length: 8 }, (_, index) => {
-  const value = Math.pow(2, index)
-
-  return {
-    value: `PING_EVERY_${value}S`,
-    label: <Message content={sharedMessages.secondInterval} values={{ count: value }} />,
-  }
-})
-// 0...15
-export const adrAckLimitOptions = Array.from({ length: 16 }, (_, index) => {
-  const value = Math.pow(2, index)
-
-  return {
-    value: `ADR_ACK_LIMIT_${value}`,
-    label: <Message content={sharedMessages.adrAckValue} values={{ count: value }} />,
-  }
-})
-// 0...15
-export const adrAckDelayOptions = Array.from({ length: 16 }, (_, index) => {
-  const value = Math.pow(2, index)
-
-  return {
-    value: `ADR_ACK_DELAY_${value}`,
-    label: <Message content={sharedMessages.adrAckValue} values={{ count: value }} />,
-  }
-})
-export const maxDutyCycleOptions = [
-  { value: 'DUTY_CYCLE_1', label: '100%' },
-  { value: 'DUTY_CYCLE_16', label: '6.25%' },
-  { value: 'DUTY_CYCLE_128', label: '0.781%' },
-  { value: 'DUTY_CYCLE_1024', label: '0.098%' },
-  { value: 'DUTY_CYCLE_16384', label: '0.006%' },
-]
diff --git a/pkg/webui/console/lib/mac-settings-utils.js b/pkg/webui/console/lib/mac-settings-utils.js
new file mode 100644
index 0000000000..d34b5992d2
--- /dev/null
+++ b/pkg/webui/console/lib/mac-settings-utils.js
@@ -0,0 +1,54 @@
+// Copyright © 2025 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import React from 'react'
+
+import Message from '@ttn-lw/lib/components/message'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+// 0...7
+export const pingSlotPeriodicityOptions = Array.from({ length: 8 }, (_, index) => {
+  const value = Math.pow(2, index)
+
+  return {
+    value: `PING_EVERY_${value}S`,
+    label: <Message content={sharedMessages.secondInterval} values={{ count: value }} />,
+  }
+})
+// 0...15
+export const adrAckLimitOptions = Array.from({ length: 16 }, (_, index) => {
+  const value = Math.pow(2, index)
+
+  return {
+    value: `ADR_ACK_LIMIT_${value}`,
+    label: <Message content={sharedMessages.adrAckValue} values={{ count: value }} />,
+  }
+})
+// 0...15
+export const adrAckDelayOptions = Array.from({ length: 16 }, (_, index) => {
+  const value = Math.pow(2, index)
+
+  return {
+    value: `ADR_ACK_DELAY_${value}`,
+    label: <Message content={sharedMessages.adrAckValue} values={{ count: value }} />,
+  }
+})
+export const maxDutyCycleOptions = [
+  { value: 'DUTY_CYCLE_1', label: '100%' },
+  { value: 'DUTY_CYCLE_16', label: '6.25%' },
+  { value: 'DUTY_CYCLE_128', label: '0.781%' },
+  { value: 'DUTY_CYCLE_1024', label: '0.098%' },
+  { value: 'DUTY_CYCLE_16384', label: '0.006%' },
+]

From 52f8520582cd92938ab50fe4a6a2b4edb9623373 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 8 Sep 2025 11:07:59 +0200
Subject: [PATCH 12/17] dev: Fix smoke tests

---
 cypress/e2e/smoke/devices/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/e2e/smoke/devices/index.js b/cypress/e2e/smoke/devices/index.js
index 9e41efae17..9c16261cfc 100644
--- a/cypress/e2e/smoke/devices/index.js
+++ b/cypress/e2e/smoke/devices/index.js
@@ -124,7 +124,7 @@ const checkCollapsingFields = defineSmokeTest('check all end device sub pages',
         cy.findByLabelText('Frequency plan').should('be.visible')
         cy.get('button[type="submit"]').scrollIntoView()
         cy.findByRole('button', { name: 'Save changes' }).should('be.visible')
-        cy.findByText('Advanced MAC settings').click()
+        cy.findByText('Custom MAC settings').click()
         cy.get('#mac-settings').scrollIntoView()
         cy.findByText('Frame counter width').should('be.visible')
         cy.findByTestId('error-notification').should('not.exist')

From 7e9d4794e1de94d29a505d69144878faec4571b2 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 8 Sep 2025 11:21:39 +0200
Subject: [PATCH 13/17] console: Fix api-definition

---
 sdk/js/generated/api-definition.json | 414 +++++++++++++--------------
 1 file changed, 207 insertions(+), 207 deletions(-)

diff --git a/sdk/js/generated/api-definition.json b/sdk/js/generated/api-definition.json
index 9cdca84c2e..0dd792adc5 100644
--- a/sdk/js/generated/api-definition.json
+++ b/sdk/js/generated/api-definition.json
@@ -4573,75 +4573,75 @@
         "lorawan_version",
         "mac_settings",
         "mac_settings.adr",
-        "mac_settings.adr",
-        "mac_settings.adr.disabled",
-        "mac_settings.adr.dynamic",
-        "mac_settings.adr.dynamic.channel_steering",
-        "mac_settings.adr.dynamic.channel_steering.mode",
-        "mac_settings.adr.dynamic.channel_steering.mode.disabled",
-        "mac_settings.adr.dynamic.channel_steering.mode.lora_narrow",
-        "mac_settings.adr.dynamic.margin",
-        "mac_settings.adr.dynamic.max_data_rate_index",
-        "mac_settings.adr.dynamic.max_data_rate_index.value",
-        "mac_settings.adr.dynamic.max_nb_trans",
-        "mac_settings.adr.dynamic.max_tx_power_index",
-        "mac_settings.adr.dynamic.min_data_rate_index",
-        "mac_settings.adr.dynamic.min_data_rate_index.value",
-        "mac_settings.adr.dynamic.min_nb_trans",
-        "mac_settings.adr.dynamic.min_tx_power_index",
-        "mac_settings.adr.dynamic.overrides",
-        "mac_settings.adr.dynamic.overrides.data_rate_0",
-        "mac_settings.adr.dynamic.overrides.data_rate_0.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_0.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_1",
-        "mac_settings.adr.dynamic.overrides.data_rate_1.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_1.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_10",
-        "mac_settings.adr.dynamic.overrides.data_rate_10.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_10.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_11",
-        "mac_settings.adr.dynamic.overrides.data_rate_11.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_11.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_12",
-        "mac_settings.adr.dynamic.overrides.data_rate_12.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_12.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_13",
-        "mac_settings.adr.dynamic.overrides.data_rate_13.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_13.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_14",
-        "mac_settings.adr.dynamic.overrides.data_rate_14.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_14.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_15",
-        "mac_settings.adr.dynamic.overrides.data_rate_15.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_15.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_2",
-        "mac_settings.adr.dynamic.overrides.data_rate_2.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_2.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_3",
-        "mac_settings.adr.dynamic.overrides.data_rate_3.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_3.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_4",
-        "mac_settings.adr.dynamic.overrides.data_rate_4.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_4.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_5",
-        "mac_settings.adr.dynamic.overrides.data_rate_5.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_5.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_6",
-        "mac_settings.adr.dynamic.overrides.data_rate_6.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_6.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_7",
-        "mac_settings.adr.dynamic.overrides.data_rate_7.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_7.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_8",
-        "mac_settings.adr.dynamic.overrides.data_rate_8.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_8.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_9",
-        "mac_settings.adr.dynamic.overrides.data_rate_9.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_9.min_nb_trans",
-        "mac_settings.adr.static",
-        "mac_settings.adr.static.data_rate_index",
-        "mac_settings.adr.static.nb_trans",
-        "mac_settings.adr.static.tx_power_index",
+        "mac_settings.adr.mode",
+        "mac_settings.adr.mode.disabled",
+        "mac_settings.adr.mode.dynamic",
+        "mac_settings.adr.mode.dynamic.channel_steering",
+        "mac_settings.adr.mode.dynamic.channel_steering.mode",
+        "mac_settings.adr.mode.dynamic.channel_steering.mode.disabled",
+        "mac_settings.adr.mode.dynamic.channel_steering.mode.lora_narrow",
+        "mac_settings.adr.mode.dynamic.margin",
+        "mac_settings.adr.mode.dynamic.max_data_rate_index",
+        "mac_settings.adr.mode.dynamic.max_data_rate_index.value",
+        "mac_settings.adr.mode.dynamic.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.max_tx_power_index",
+        "mac_settings.adr.mode.dynamic.min_data_rate_index",
+        "mac_settings.adr.mode.dynamic.min_data_rate_index.value",
+        "mac_settings.adr.mode.dynamic.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.min_tx_power_index",
+        "mac_settings.adr.mode.dynamic.overrides",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_0",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_0.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_0.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_1",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_1.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_1.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_10",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_10.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_10.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_11",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_11.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_11.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_12",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_12.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_12.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_13",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_13.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_13.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_14",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_14.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_14.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_15",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_15.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_15.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_2",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_2.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_2.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_3",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_3.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_3.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_4",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_4.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_4.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_5",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_5.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_5.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_6",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_6.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_6.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_7",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_7.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_7.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_8",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_8.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_8.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_9",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_9.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_9.min_nb_trans",
+        "mac_settings.adr.mode.static",
+        "mac_settings.adr.mode.static.data_rate_index",
+        "mac_settings.adr.mode.static.nb_trans",
+        "mac_settings.adr.mode.static.tx_power_index",
         "mac_settings.adr_margin",
         "mac_settings.beacon_frequency",
         "mac_settings.beacon_frequency.value",
@@ -5200,75 +5200,75 @@
         "lorawan_version",
         "mac_settings",
         "mac_settings.adr",
-        "mac_settings.adr",
-        "mac_settings.adr.disabled",
-        "mac_settings.adr.dynamic",
-        "mac_settings.adr.dynamic.channel_steering",
-        "mac_settings.adr.dynamic.channel_steering.mode",
-        "mac_settings.adr.dynamic.channel_steering.mode.disabled",
-        "mac_settings.adr.dynamic.channel_steering.mode.lora_narrow",
-        "mac_settings.adr.dynamic.margin",
-        "mac_settings.adr.dynamic.max_data_rate_index",
-        "mac_settings.adr.dynamic.max_data_rate_index.value",
-        "mac_settings.adr.dynamic.max_nb_trans",
-        "mac_settings.adr.dynamic.max_tx_power_index",
-        "mac_settings.adr.dynamic.min_data_rate_index",
-        "mac_settings.adr.dynamic.min_data_rate_index.value",
-        "mac_settings.adr.dynamic.min_nb_trans",
-        "mac_settings.adr.dynamic.min_tx_power_index",
-        "mac_settings.adr.dynamic.overrides",
-        "mac_settings.adr.dynamic.overrides.data_rate_0",
-        "mac_settings.adr.dynamic.overrides.data_rate_0.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_0.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_1",
-        "mac_settings.adr.dynamic.overrides.data_rate_1.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_1.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_10",
-        "mac_settings.adr.dynamic.overrides.data_rate_10.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_10.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_11",
-        "mac_settings.adr.dynamic.overrides.data_rate_11.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_11.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_12",
-        "mac_settings.adr.dynamic.overrides.data_rate_12.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_12.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_13",
-        "mac_settings.adr.dynamic.overrides.data_rate_13.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_13.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_14",
-        "mac_settings.adr.dynamic.overrides.data_rate_14.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_14.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_15",
-        "mac_settings.adr.dynamic.overrides.data_rate_15.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_15.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_2",
-        "mac_settings.adr.dynamic.overrides.data_rate_2.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_2.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_3",
-        "mac_settings.adr.dynamic.overrides.data_rate_3.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_3.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_4",
-        "mac_settings.adr.dynamic.overrides.data_rate_4.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_4.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_5",
-        "mac_settings.adr.dynamic.overrides.data_rate_5.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_5.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_6",
-        "mac_settings.adr.dynamic.overrides.data_rate_6.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_6.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_7",
-        "mac_settings.adr.dynamic.overrides.data_rate_7.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_7.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_8",
-        "mac_settings.adr.dynamic.overrides.data_rate_8.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_8.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_9",
-        "mac_settings.adr.dynamic.overrides.data_rate_9.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_9.min_nb_trans",
-        "mac_settings.adr.static",
-        "mac_settings.adr.static.data_rate_index",
-        "mac_settings.adr.static.nb_trans",
-        "mac_settings.adr.static.tx_power_index",
+        "mac_settings.adr.mode",
+        "mac_settings.adr.mode.disabled",
+        "mac_settings.adr.mode.dynamic",
+        "mac_settings.adr.mode.dynamic.channel_steering",
+        "mac_settings.adr.mode.dynamic.channel_steering.mode",
+        "mac_settings.adr.mode.dynamic.channel_steering.mode.disabled",
+        "mac_settings.adr.mode.dynamic.channel_steering.mode.lora_narrow",
+        "mac_settings.adr.mode.dynamic.margin",
+        "mac_settings.adr.mode.dynamic.max_data_rate_index",
+        "mac_settings.adr.mode.dynamic.max_data_rate_index.value",
+        "mac_settings.adr.mode.dynamic.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.max_tx_power_index",
+        "mac_settings.adr.mode.dynamic.min_data_rate_index",
+        "mac_settings.adr.mode.dynamic.min_data_rate_index.value",
+        "mac_settings.adr.mode.dynamic.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.min_tx_power_index",
+        "mac_settings.adr.mode.dynamic.overrides",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_0",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_0.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_0.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_1",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_1.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_1.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_10",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_10.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_10.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_11",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_11.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_11.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_12",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_12.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_12.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_13",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_13.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_13.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_14",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_14.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_14.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_15",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_15.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_15.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_2",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_2.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_2.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_3",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_3.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_3.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_4",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_4.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_4.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_5",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_5.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_5.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_6",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_6.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_6.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_7",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_7.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_7.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_8",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_8.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_8.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_9",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_9.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_9.min_nb_trans",
+        "mac_settings.adr.mode.static",
+        "mac_settings.adr.mode.static.data_rate_index",
+        "mac_settings.adr.mode.static.nb_trans",
+        "mac_settings.adr.mode.static.tx_power_index",
         "mac_settings.adr_margin",
         "mac_settings.beacon_frequency",
         "mac_settings.beacon_frequency.value",
@@ -5815,75 +5815,75 @@
         "lorawan_version",
         "mac_settings",
         "mac_settings.adr",
-        "mac_settings.adr",
-        "mac_settings.adr.disabled",
-        "mac_settings.adr.dynamic",
-        "mac_settings.adr.dynamic.channel_steering",
-        "mac_settings.adr.dynamic.channel_steering.mode",
-        "mac_settings.adr.dynamic.channel_steering.mode.disabled",
-        "mac_settings.adr.dynamic.channel_steering.mode.lora_narrow",
-        "mac_settings.adr.dynamic.margin",
-        "mac_settings.adr.dynamic.max_data_rate_index",
-        "mac_settings.adr.dynamic.max_data_rate_index.value",
-        "mac_settings.adr.dynamic.max_nb_trans",
-        "mac_settings.adr.dynamic.max_tx_power_index",
-        "mac_settings.adr.dynamic.min_data_rate_index",
-        "mac_settings.adr.dynamic.min_data_rate_index.value",
-        "mac_settings.adr.dynamic.min_nb_trans",
-        "mac_settings.adr.dynamic.min_tx_power_index",
-        "mac_settings.adr.dynamic.overrides",
-        "mac_settings.adr.dynamic.overrides.data_rate_0",
-        "mac_settings.adr.dynamic.overrides.data_rate_0.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_0.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_1",
-        "mac_settings.adr.dynamic.overrides.data_rate_1.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_1.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_10",
-        "mac_settings.adr.dynamic.overrides.data_rate_10.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_10.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_11",
-        "mac_settings.adr.dynamic.overrides.data_rate_11.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_11.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_12",
-        "mac_settings.adr.dynamic.overrides.data_rate_12.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_12.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_13",
-        "mac_settings.adr.dynamic.overrides.data_rate_13.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_13.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_14",
-        "mac_settings.adr.dynamic.overrides.data_rate_14.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_14.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_15",
-        "mac_settings.adr.dynamic.overrides.data_rate_15.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_15.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_2",
-        "mac_settings.adr.dynamic.overrides.data_rate_2.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_2.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_3",
-        "mac_settings.adr.dynamic.overrides.data_rate_3.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_3.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_4",
-        "mac_settings.adr.dynamic.overrides.data_rate_4.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_4.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_5",
-        "mac_settings.adr.dynamic.overrides.data_rate_5.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_5.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_6",
-        "mac_settings.adr.dynamic.overrides.data_rate_6.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_6.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_7",
-        "mac_settings.adr.dynamic.overrides.data_rate_7.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_7.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_8",
-        "mac_settings.adr.dynamic.overrides.data_rate_8.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_8.min_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_9",
-        "mac_settings.adr.dynamic.overrides.data_rate_9.max_nb_trans",
-        "mac_settings.adr.dynamic.overrides.data_rate_9.min_nb_trans",
-        "mac_settings.adr.static",
-        "mac_settings.adr.static.data_rate_index",
-        "mac_settings.adr.static.nb_trans",
-        "mac_settings.adr.static.tx_power_index",
+        "mac_settings.adr.mode",
+        "mac_settings.adr.mode.disabled",
+        "mac_settings.adr.mode.dynamic",
+        "mac_settings.adr.mode.dynamic.channel_steering",
+        "mac_settings.adr.mode.dynamic.channel_steering.mode",
+        "mac_settings.adr.mode.dynamic.channel_steering.mode.disabled",
+        "mac_settings.adr.mode.dynamic.channel_steering.mode.lora_narrow",
+        "mac_settings.adr.mode.dynamic.margin",
+        "mac_settings.adr.mode.dynamic.max_data_rate_index",
+        "mac_settings.adr.mode.dynamic.max_data_rate_index.value",
+        "mac_settings.adr.mode.dynamic.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.max_tx_power_index",
+        "mac_settings.adr.mode.dynamic.min_data_rate_index",
+        "mac_settings.adr.mode.dynamic.min_data_rate_index.value",
+        "mac_settings.adr.mode.dynamic.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.min_tx_power_index",
+        "mac_settings.adr.mode.dynamic.overrides",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_0",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_0.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_0.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_1",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_1.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_1.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_10",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_10.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_10.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_11",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_11.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_11.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_12",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_12.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_12.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_13",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_13.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_13.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_14",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_14.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_14.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_15",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_15.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_15.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_2",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_2.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_2.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_3",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_3.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_3.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_4",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_4.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_4.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_5",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_5.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_5.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_6",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_6.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_6.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_7",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_7.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_7.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_8",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_8.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_8.min_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_9",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_9.max_nb_trans",
+        "mac_settings.adr.mode.dynamic.overrides.data_rate_9.min_nb_trans",
+        "mac_settings.adr.mode.static",
+        "mac_settings.adr.mode.static.data_rate_index",
+        "mac_settings.adr.mode.static.nb_trans",
+        "mac_settings.adr.mode.static.tx_power_index",
         "mac_settings.adr_margin",
         "mac_settings.beacon_frequency",
         "mac_settings.beacon_frequency.value",

From 484b71056e4ddae4c5f591a65a403c6ad9c135f5 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 8 Sep 2025 11:49:32 +0200
Subject: [PATCH 14/17] console: Fix comments

---
 pkg/webui/console/components/mac-settings-section/index.js     | 1 +
 .../containers/mac-settings-profile-form/form-validation.js    | 2 +-
 .../console/containers/mac-settings-profile-form/index.js      | 3 ++-
 .../network-server-form/validation-schema.js                   | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkg/webui/console/components/mac-settings-section/index.js b/pkg/webui/console/components/mac-settings-section/index.js
index fca3821b9e..0abb9ce3b2 100644
--- a/pkg/webui/console/components/mac-settings-section/index.js
+++ b/pkg/webui/console/components/mac-settings-section/index.js
@@ -704,6 +704,7 @@ const MacSettingsSection = props => {
                   component={Input}
                   type="number"
                   inputWidth="xs"
+                  min={0}
                 />
                 <Form.Field
                   title={sharedMessages.adrTransPower}
diff --git a/pkg/webui/console/containers/mac-settings-profile-form/form-validation.js b/pkg/webui/console/containers/mac-settings-profile-form/form-validation.js
index 1d62ca0eb2..7d137f0ac0 100644
--- a/pkg/webui/console/containers/mac-settings-profile-form/form-validation.js
+++ b/pkg/webui/console/containers/mac-settings-profile-form/form-validation.js
@@ -205,7 +205,7 @@ export const validationSchema = Yup.object().shape({
         .default([])
         .test(
           'is-valid-frequency',
-          sharedMessages.validateFreqNumberic,
+          sharedMessages.validateFreqNumeric,
           factoryPresetFreqNumericTest,
         )
         .test(
diff --git a/pkg/webui/console/containers/mac-settings-profile-form/index.js b/pkg/webui/console/containers/mac-settings-profile-form/index.js
index 820fa8d5d4..9dc4b49a05 100644
--- a/pkg/webui/console/containers/mac-settings-profile-form/index.js
+++ b/pkg/webui/console/containers/mac-settings-profile-form/index.js
@@ -61,7 +61,7 @@ const m = defineMessages({
 
 // 0...15
 const dataRateOverrideOptions = Array.from({ length: 16 }, (_, index) => ({
-  value: `data_rate${index}`,
+  value: `data_rate_${index}`,
   label: <Message content={sharedMessages.dataRate} values={{ n: index }} />,
 }))
 
@@ -539,6 +539,7 @@ const MACSettingsProfileInnerForm = ({ edit }) => {
             component={Input}
             type="number"
             inputWidth="xs"
+            min={0}
           />
           <Form.Field
             title={sharedMessages.adrTransPower}
diff --git a/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js b/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js
index 81ca41e295..aa913d9ab7 100644
--- a/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js
+++ b/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js
@@ -325,7 +325,7 @@ const validationSchema = Yup.object()
               .default([])
               .test(
                 'is-valid-frequency',
-                sharedMessages.validateFreqNumberic,
+                sharedMessages.validateFreqNumeric,
                 factoryPresetFreqNumericTest,
               )
               .test(

From 8371f64960662643fb3467dce15535ca44af4cd7 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 8 Sep 2025 12:07:54 +0200
Subject: [PATCH 15/17] console: Fix validation schema

---
 .../network-server-form/validation-schema.js    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js b/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js
index aa913d9ab7..cfda149fe3 100644
--- a/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js
+++ b/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { isEmpty } from 'lodash'
+
 import Yup from '@ttn-lw/lib/yup'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 
@@ -461,11 +463,16 @@ const validationSchema = Yup.object()
         })
       },
     ),
-    mac_settings_profile_ids: Yup.object()
-      .shape({
-        profile_id: Yup.string(),
-      })
-      .nullable(),
+    mac_settings_profile_ids: Yup.lazy(value => {
+      if (!Boolean(value) || isEmpty(value)) {
+        return Yup.object().strip()
+      }
+      return Yup.object()
+        .shape({
+          profile_id: Yup.string(),
+        })
+        .nullable()
+    }),
   })
   .noUnknown()
 

From ed9a9449151662bd5e874728bc0d72c870a1ba84 Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 8 Sep 2025 12:40:16 +0200
Subject: [PATCH 16/17] console: Fix validation

---
 .../network-server-form/index.js                       | 10 +++++++++-
 .../network-server-form/validation-schema.js           |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkg/webui/console/views/device-general-settings/network-server-form/index.js b/pkg/webui/console/views/device-general-settings/network-server-form/index.js
index 2e0ab41b52..9e8c517f34 100644
--- a/pkg/webui/console/views/device-general-settings/network-server-form/index.js
+++ b/pkg/webui/console/views/device-general-settings/network-server-form/index.js
@@ -286,6 +286,7 @@ const NetworkServerForm = React.memo(props => {
 
   const handleSubmit = React.useCallback(
     async (values, { resetForm, setSubmitting }) => {
+      console.log('values', values)
       let parsedValues = values
       // If the nbTrans values are not overridden, remove them from the payload.
       if (
@@ -312,7 +313,7 @@ const NetworkServerForm = React.memo(props => {
         context: validationContext,
         stripUnknown: true,
       })
-
+      console.log('castedValues', castedValues)
       const updatedValues = diff(device, castedValues, {
         exclude: [
           '_activation_mode',
@@ -328,6 +329,7 @@ const NetworkServerForm = React.memo(props => {
       })
 
       const patch = updatedValues
+
       // Always submit current `mac_settings` values to avoid overwriting nested entries.
       patch.mac_settings = castedValues.mac_settings
 
@@ -354,6 +356,12 @@ const NetworkServerForm = React.memo(props => {
         patch.mac_settings.use_adr = null
       }
 
+      // The validation schema strips `mac_settings_profile_ids` if it is empty.
+      // We need to explicitly set it to null in order to remove the existing profile association.
+      if (values.mac_settings_profile_ids === null) {
+        patch.mac_settings_profile_ids = null
+      }
+
       if (Boolean(patch.mac_settings_profile_ids)) {
         patch.mac_settings_profile_ids = {
           ...patch.mac_settings_profile_ids,
diff --git a/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js b/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js
index cfda149fe3..ce92e86012 100644
--- a/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js
+++ b/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js
@@ -464,7 +464,7 @@ const validationSchema = Yup.object()
       },
     ),
     mac_settings_profile_ids: Yup.lazy(value => {
-      if (!Boolean(value) || isEmpty(value)) {
+      if (value === undefined || isEmpty(value)) {
         return Yup.object().strip()
       }
       return Yup.object()

From 6c4085106d2882b9080b80ebc47e2b33739366cd Mon Sep 17 00:00:00 2001
From: Darya Plotnytska <d.plotnytska.s@gmail.com>
Date: Mon, 8 Sep 2025 12:41:27 +0200
Subject: [PATCH 17/17] console: Remove console.log

---
 .../views/device-general-settings/network-server-form/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg/webui/console/views/device-general-settings/network-server-form/index.js b/pkg/webui/console/views/device-general-settings/network-server-form/index.js
index 9e8c517f34..6d8f0d4038 100644
--- a/pkg/webui/console/views/device-general-settings/network-server-form/index.js
+++ b/pkg/webui/console/views/device-general-settings/network-server-form/index.js
@@ -286,7 +286,6 @@ const NetworkServerForm = React.memo(props => {
 
   const handleSubmit = React.useCallback(
     async (values, { resetForm, setSubmitting }) => {
-      console.log('values', values)
       let parsedValues = values
       // If the nbTrans values are not overridden, remove them from the payload.
       if (
@@ -313,7 +312,7 @@ const NetworkServerForm = React.memo(props => {
         context: validationContext,
         stripUnknown: true,
       })
-      console.log('castedValues', castedValues)
+
       const updatedValues = diff(device, castedValues, {
         exclude: [
           '_activation_mode',