Merge pull request #6660 from TheThingsNetwork/fix/reset-mac-state

Fix reset session and mac state
TheThingsNetwork · Oct 31, 2023 · b4aa590 · b4aa590
2 parents 29e889b + 6c5b94e
commit b4aa590
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/pkg/webui/console/views/device-general-settings/join-server-form/index.js b/pkg/webui/console/views/device-general-settings/join-server-form/index.js
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import React from 'react'
+import { useDispatch } from 'react-redux'
 
 import SubmitButton from '@ttn-lw/components/submit-button'
 import SubmitBar from '@ttn-lw/components/submit-bar'
@@ -29,6 +30,7 @@ import tooltipIds from '@ttn-lw/lib/constants/tooltip-ids'
 import diff from '@ttn-lw/lib/diff'
 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 { parseLorawanMacVersion, generate16BytesKey } from '@console/lib/device-utils'
 
@@ -79,9 +81,12 @@ const JoinServerForm = React.memo(props => {
     [device, validationContext],
   )
 
+  const dispatch = useDispatch()
+  const appId = device.ids.application_ids.application_id
+  const devId = device.ids.device_id
   const handleUsedDevNoncesReset = React.useCallback(async () => {
     try {
-      await onUsedDevNoncesReset()
+      await dispatch(attachPromise(onUsedDevNoncesReset(appId, devId)))
       toast({
         message: messages.resetSuccess,
         type: toast.types.SUCCESS,
@@ -92,7 +97,7 @@ const JoinServerForm = React.memo(props => {
         type: toast.types.ERROR,
       })
     }
-  }, [onUsedDevNoncesReset])
+  }, [onUsedDevNoncesReset, appId, devId, dispatch])
 
   // Setup and memoize callbacks for changes to `resets_join_nonces` for displaying the field warning.
   const handleResetsJoinNoncesChange = React.useCallback(

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
@@ -14,6 +14,7 @@
 
 import React from 'react'
 import { defineMessages } from 'react-intl'
+import { useDispatch } from 'react-redux'
 
 import Link from '@ttn-lw/components/link'
 import ModalButton from '@ttn-lw/components/button/modal-button'
@@ -40,6 +41,7 @@ import { isBackend, getBackendErrorName } from '@ttn-lw/lib/errors/utils'
 import diff from '@ttn-lw/lib/diff'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import PropTypes from '@ttn-lw/lib/prop-types'
+import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 
 import {
   parseLorawanMacVersion,
@@ -229,9 +231,13 @@ const NetworkServerForm = React.memo(props => {
       ),
     [device, initialActivationMode, isClassB, isClassC, macSettings, validationContext],
   )
+
+  const dispatch = useDispatch()
+  const appId = device.ids.application_ids.application_id
+  const devId = device.ids.device_id
   const handleMacReset = React.useCallback(async () => {
     try {
-      await onMacReset()
+      await dispatch(attachPromise(onMacReset(appId, devId)))
       toast({
         message: m.resetSuccess,
         type: toast.types.SUCCESS,
@@ -242,7 +248,7 @@ const NetworkServerForm = React.memo(props => {
         type: toast.types.ERROR,
       })
     }
-  }, [onMacReset])
+  }, [onMacReset, dispatch, devId, appId])
 
   const handleSubmit = React.useCallback(
     async (values, { resetForm, setSubmitting }) => {